Skip to content

Conversation

@microbit-sam
Copy link
Collaborator

Updated uPy to 1.0.0
Added help box with version info

@microbit-carlos
Copy link
Collaborator

When opening the editor.html I get the following error:

Uncaught ReferenceError: VERSION is not defined
at setupEditor (python-main.js:310)
at web_editor (python-main.js:738)
at VM49 editor.html:281

The line in python-main.js is 310:

PythonEditor/python-main.js

Lines 308 to 312 in 0e7c3a6

function setupEditor(message) {
// Set version in document title
document.title = document.title + ' ' + VERSION;
// Setup the Ace editor.
EDITOR = pythonEditor('editor');

The problem is because now in the editor.html file we have:

PythonEditor/editor.html

Lines 71 to 74 in 0e7c3a6

<script type="application/javascript">
<!-- VERSION INFORMATION -->
EDITOR_VERSION = "1.1.0";
UPY_VERSION = "1.0.0";

When did python-main remove that line? We should look at the git history and make sure we haven't missed a commit to cherry pick into this repo.
https://github.com/microbit-foundation/python-editor/blob/1.1.0/python-main.js#L308-L311

@microbit-carlos
Copy link
Collaborator

Actually the question should have been, when was that line added to the bbcmicrobit/PythonEditor repository, which was the 16 Mar 2017: b02f045

When v1.1.0 was released, the last bbcmicrobit/PythonEditor commit in python-editor was from the 9th of Feb 2017.

So we can just fix this line in a new commit.

@microbit-carlos
Copy link
Collaborator

Everything else looks good, so I'll do a quick edit to this branch and merge.
@microbit-sam when that is done, could you rebase the other PRs?

@microbit-carlos
Copy link
Collaborator

Just realised the branch is in your fork, so if you could add the fix, then merge and rebase all the other PRs.

@microbit-sam
Copy link
Collaborator Author

Think that should do it

Copy link
Collaborator

@microbit-carlos microbit-carlos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for merge, thanks Sam!

@microbit-carlos microbit-carlos merged commit da26cb4 into bbcmicrobit:master Feb 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants