bbcmicrobit · WilliamMayor · Mar 27, 2017 · Mar 27, 2017 · Mar 27, 2017 · Mar 27, 2017
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ Thumbs.db
 Desktop.ini
 $RECYCLE.BIN/
 *.swp
+.vagrant
diff --git a/.nojekyll b/.nojekyll
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+micro-edit.codeguild.co
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,23 @@
+# Don't use this dockerfile in production. It's useful for getting a
+# development environment working quickly. It's not a good way to serve the
+# editor files.
+#
+# To run a container using this image first build the image:
+#
+# $ docker build -t pythoneditor .
+#
+# Then run the image:
+#
+# $ docker run --interactive --tty --publish 8000:8000 pythoneditor
+#
+# Now open your browser at http://localhost:8000
+#
+FROM python:3.6
+
+WORKDIR /usr/src/app
+
+EXPOSE 8000
+
+COPY . /usr/src/app/
+
+CMD python -m http.server --bind 0.0.0.0
diff --git a/README.rst b/README.rst
@@ -14,17 +14,15 @@ This editor works with any modern web browser.
 In addition to cloning the repository it is required to retrieve the GIT
 submodules::
 
-    git clone https://github.com/bbcmicrobit/PythonEditor
+    git clone https://github.com/ducklord420/PythonEditor.git
     cd PythonEditor
     git submodule update --init --recursive
 
 **THIS NEEDS TO BE DONE BEFORE ANYTHING ELSE, OR IT WILL NOT WORK.**
 
 Assuming you have Python 3 installed you can serve the editor like this::
 
-    $ ./bin/show
-    http://localhost:8000/editor.html
-    Serving HTTP on 0.0.0.0 port 8000 ...
+    py -m http.server --bind 0.0.0.0
 
 As the script tells us, point your browser to http://localhost:8000/editor.html.
 
@@ -179,3 +177,8 @@ Legacy
 This project was born from a TouchDevelop based editor created by Nicholas
 H.Tollervey for the BBC. This is no longer maintained, although you can find it
 still on the ``touch-develop-legacy`` branch in this repository.
+
+Villiers Park
+-------------
+
+Max Curtis-England
diff --git a/ace/ace.js b/ace/ace.js
diff --git a/ace/ext-spellcheck.js b/ace/ext-spellcheck.js
diff --git a/editor.html b/editor.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
     <!--
                                                                              .:://++++++//:-.
@@ -68,6 +68,7 @@
         <link rel="icon" href="static/img/favicon.ico">
     </head>
     <body>
+        <iframe id="sim-iframe" src="about:blank" frameborder="0" scrolling="no"></iframe>
         <script type="application/javascript">
             if (navigator.appVersion.indexOf("MSIE 9") !== -1 || navigator.appVersion.indexOf("MSIE 8") !== -1 || navigator.appVersion.indexOf("MSIE 7") !== -1)
             {
@@ -90,7 +91,7 @@ <h2><i class="fa fa-upload"></i> <strong>{{ title }}</strong></h2>
                 <form id="load-form-form">
                     <input type="file" name="load-form-file-upload"/><br/>
                     <input type="submit" value="{{ submit }}"/>
-                </form>
+                    </form>
             </div>
             <div id="load-alt">
                 <p><a href="#" class="load-form load-toggle">{{ toggle-drop }}</a></p>
@@ -129,6 +130,22 @@ <h2><i class="fa fa-share-alt"></i> <strong>{{ title }}</strong></h2>
                 <p id="shortener" style="display: none;">{{ shortener }} <a href="#" id="short-link"></a></p>
             </div>
         </script>
+        <script id="save-name-template" type="x-tmpl-mustache">
+            <h2><i class="fa fa-download"></i> <strong>{{ title }}</strong></h2>
+            <div id="make-link">
+                <p>{{ instructions }}</p>
+                <p><label for="passphrase" class="share-label">{{ passphrase }}</label> <input id="filename-input" type="text" value="{{ currentfilename }}"/>
+                </p>
+                <p><label for="passphrase" class="share-label">{{ passphrase2 }}</label> <input id="desc-input" type="text" value="{{ currentdesc }}"/>
+                </p>
+                <p><button id="button-save-file">{{ button }}</button></p>
+            </div>
+            <div id="share-link">
+                <p>{{ description }}</p>
+                <textarea id="direct-link" readonly style="width:100%; height:200px;border:0;"></textarea>
+                <p id="shortener" style="display: none;">{{ shortener }} <a href="#" id="short-link"></a></p>
+            </div>
+        </script>
         <script id="decrypt-template" type="x-tmpl-mustache">
             <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
             <p>{{ instructions }}</p>
@@ -181,6 +198,13 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
                     </div>
                     <div class="roundlabel">Blockly</div>
                 </a>
+                <a href="#" class="roundbutton hidden" id="command-sim"
+                    tabindex="12">
+                    <div class="roundsymbol">
+                        <i class="fa fa-arrow-circle-right"></i>
+                    </div>
+                    <div class="roundlabel">Sim</div>
+                </a>
                 <a href="#" class="roundbutton hidden" id="command-snippet"
                     tabindex="5"
                     title="Click to select a snippet (code shortcut)">
@@ -234,10 +258,10 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
                 </div>
             </div>
             <div class="vbox" id="script-box">
-                <div id="script-name" class="flex1" contenteditable
+                <div id="script-name" class="flex1"
                     tabindex="10">
                 </div>
-                <div id="script-description" contenteditable
+                <div id="script-description"
                     tabindex="11">
                 </div>
             </div>
@@ -365,11 +389,13 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
     'flags': {
       'blocks': false,
       'snippets': true,
+      'share': false,
       'experimental': false,
-      'share': false
+      'sim': true
     },
 });
         </script>
+
 <xml id="blockly-toolbox" style="display: none">
   <category name="Accelerometer" colour="0">
     <block type="microbit_accelerometer_get_x"></block>
@@ -700,6 +726,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
 	    <sep></sep>
 	    <category name="Variables" colour="330" custom="VARIABLE"></category>
 	  </xml>
+:1040A0000123037210BDC046ACCF020008B5043036
         <div id="firmware" style="display: none;">:020000040000FA
 :1000000000400020218E01005D8E01005F8E010006
 :1000100000000000000000000000000000000000E0

diff --git a/index.html b/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+    <head>
+        <meta charset="UTF-8">
+        <meta http-equiv="refresh" content="1; url=/editor.html">
+        <script type="text/javascript">
+            window.location.href = "/editor.html"
+        </script>
+        <title>Page Redirection</title>
+    </head>
+    <body>
+        If you are not redirected automatically, follow this <a href='/editor.html'>link to example</a>.
+    </body>
+</html>
diff --git a/lib/cm/active-line.js b/lib/cm/active-line.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var WRAP_CLASS = "CodeMirror-activeline";
+  var BACK_CLASS = "CodeMirror-activeline-background";
+  var GUTT_CLASS = "CodeMirror-activeline-gutter";
+
+  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
+    var prev = old == CodeMirror.Init ? false : old;
+    if (val == prev) return
+    if (prev) {
+      cm.off("beforeSelectionChange", selectionChange);
+      clearActiveLines(cm);
+      delete cm.state.activeLines;
+    }
+    if (val) {
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
+      cm.on("beforeSelectionChange", selectionChange);
+    }
+  });
+
+  function clearActiveLines(cm) {
+    for (var i = 0; i < cm.state.activeLines.length; i++) {
+      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "gutter", GUTT_CLASS);
+    }
+  }
+
+  function sameArray(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++)
+      if (a[i] != b[i]) return false;
+    return true;
+  }
+
+  function updateActiveLines(cm, ranges) {
+    var active = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var option = cm.getOption("styleActiveLine");
+      if (typeof option == "object" && option.nonEmpty ? range.anchor.line != range.head.line : !range.empty())
+        continue
+      var line = cm.getLineHandleVisualStart(range.head.line);
+      if (active[active.length - 1] != line) active.push(line);
+    }
+    if (sameArray(cm.state.activeLines, active)) return;
+    cm.operation(function() {
+      clearActiveLines(cm);
+      for (var i = 0; i < active.length; i++) {
+        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
+        cm.addLineClass(active[i], "background", BACK_CLASS);
+        cm.addLineClass(active[i], "gutter", GUTT_CLASS);
+      }
+      cm.state.activeLines = active;
+    });
+  }
+
+  function selectionChange(cm, sel) {
+    updateActiveLines(cm, sel.ranges);
+  }
+});
diff --git a/lib/cm/blackboard.css b/lib/cm/blackboard.css
@@ -0,0 +1,32 @@
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/lib/cm/cobalt.css b/lib/cm/cobalt.css
@@ -0,0 +1,25 @@
+.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
+.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
+.cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }