microbit-rosslowe · microbit-rosslowe · Mar 14, 2019 · Mar 6, 2019 · Mar 6, 2019 · Mar 11, 2019
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+1.1.3
+-----
+* Fixes issue loading hex files into the Editor (https://github.com/bbcmicrobit/PythonEditor/pull/89)
+* Delegates Intel Hex manipulation to a library (https://github.com/NordicSemiconductor/nrf-intel-hex)
+* Help file can read URL parameters to indicate what features to show
+* When an invalid hex file is loaded it will now display an error message (before it didn't do anything)
+
 1.1.2
 -----
 

diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ submodules::
 
 Assuming you have Python 3 installed you can serve the editor like this::
 
-    $ ./bin/show.sh
+    $ ./bin/show
     http://localhost:8000/editor.html
     Serving HTTP on 0.0.0.0 port 8000 ...
 

diff --git a/editor.html b/editor.html
@@ -69,15 +69,15 @@
     </head>
     <body>
         <script type="application/javascript">
-        if (navigator.appVersion.indexOf("MSIE 10") !== -1 || navigator.appVersion.indexOf("MSIE 9") !== -1 || navigator.appVersion.indexOf("MSIE 8") !== -1 || navigator.appVersion.indexOf("MSIE 7") !== -1)
-        {
-            document.write('<a href="https://www.microsoft.com/en-gb/download/internet-explorer.aspx">Please upgrade to IE 11 or greater.</a>');
-            document.execCommand('Stop');
-        }
+            if (navigator.appVersion.indexOf("MSIE 9") !== -1 || navigator.appVersion.indexOf("MSIE 8") !== -1 || navigator.appVersion.indexOf("MSIE 7") !== -1)
+            {
+                document.write('<a href="https://www.microsoft.com/en-gb/download/internet-explorer.aspx">Please upgrade to IE 10 or greater.</a>');
+                document.execCommand('Stop');
+            }
         </script>
         <script type="application/javascript">
             // VERSION INFORMATION
-            EDITOR_VERSION = "1.1.2";
+            EDITOR_VERSION = "1.1.3";
             UPY_VERSION = "1.0.1";
         </script>
 
@@ -260,6 +260,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
         <script src="static/js/encoding.js" type="application/javascript"></script>
         <script src="static/js/mustache.min.js"
             type="application/javascript"></script>
+        <script src="static/js/polyfill.min.js" type="application/javascript"></script>
         <script src="static/js/intel-hex.browser.js" type="application/javascript"></script>
         <script src="blockly/blockly_compressed.js"></script>
         <script src="blockly/blocks_compressed.js"></script>

diff --git a/python-main.js b/python-main.js
@@ -120,8 +120,8 @@ See the comments in-line for more information.
 function web_editor(config) {
     'use strict';
 
-    // Instance of the pythonEditor object (the ACE text editor wrapper)
-    var EDITOR = pythonEditor('editor');
+    // Global (useful for testing) instance of the ACE wrapper object
+    window.EDITOR = pythonEditor('editor');
 
     // Indicates if there are unsaved changes to the content of the editor.
     var dirty = false;

diff --git a/static/js/polyfill.min.js b/static/js/polyfill.min.js
diff --git a/tests.html b/tests.html
@@ -16,6 +16,7 @@
   <script src="static/js/jquery-2.1.4.min.js"
       type="application/javascript"></script>
   <script src="static/js/forge.min.js" type="application/javascript"></script>
+  <script src="static/js/polyfill.min.js" type="application/javascript"></script>
   <script src="static/js/intel-hex.browser.js" type="application/javascript"></script>
   <script src="hexlify.js" type="application/javascript"></script>
   <script src="python-main.js" type="application/javascript"></script>

diff --git a/tests/README.rst b/tests/README.rst
@@ -1,6 +1,11 @@
 Python Code Editor Tests
 ========================
 
+Unit tests
+----------
+
+Stored in the ``spec`` folder.
+
 To run the tests point your browser at the tests.html file in the root of this
 repository.
 
@@ -9,3 +14,9 @@ the Jasmine (https://jasmine.github.io/) BDD test library.
 
 Further tests *may* be written to exercise the wider TouchDevelop based code
 used within the editor.
+
+Manual tests
+------------
+
+Manual test procedure stored in the ``manual`` folder. All the information
+required is included in the same text file.