3 files changed, 74 insertions, 3 deletions

diff --git a/index.html b/index.html
index 41691db5..eb7c318f 100755
--- a/index.html
+++ b/index.html
@@ -231,11 +231,10 @@
         <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/searchcursor.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/match-highlighter.js"></script>
-        <script type="text/javascript" src="imports/codemirror/lib/util/simple-hint.js"></script>
+        <script type="text/javascript" src="js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/javascript-hint.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/formatting.js"></script>
 
-
         <script type="text/javascript" src="node_modules/montage/montage.js"></script>
 
             <script type="text/montage-serialization">
diff --git a/js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js b/js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js
new file mode 100644
index 00000000..e2334a45
--- /dev/null
+++ b/js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js
@@ -0,0 +1,72 @@
+(function() {
+  CodeMirror.simpleHint = function(editor, getHints) {
+    // We want a single cursor position.
+    if (editor.somethingSelected()) return;
+    var result = getHints(editor);
+    if (!result || !result.list.length) return;
+    var completions = result.list;
+    function insert(str) {
+      editor.replaceRange(str, result.from, result.to);
+    }
+    // Ninja override: don't autocomplete to reduce user's typing errors
+//    if (completions.length == 1) {insert(completions[0]); return true;}
+
+    // Build the select widget
+    var complete = document.createElement("div");
+    complete.className = "CodeMirror-completions";
+    var sel = complete.appendChild(document.createElement("select"));
+    // Opera doesn't move the selection when pressing up/down in a
+    // multi-select, but it does properly support the size property on
+    // single-selects, so no multi-select is necessary.
+    if (!window.opera) sel.multiple = true;
+    for (var i = 0; i < completions.length; ++i) {
+      var opt = sel.appendChild(document.createElement("option"));
+      opt.appendChild(document.createTextNode(completions[i]));
+    }
+    sel.firstChild.selected = true;
+    sel.size = Math.min(10, completions.length);
+    var pos = editor.cursorCoords();
+    complete.style.left = pos.x + "px";
+    complete.style.top = pos.yBot + "px";
+    document.body.appendChild(complete);
+    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
+    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
+    if(winW - pos.x < sel.clientWidth)
+      complete.style.left = (pos.x - sel.clientWidth) + "px";
+    // Hack to hide the scrollbar.
+    if (completions.length <= 10)
+      complete.style.width = (sel.clientWidth - 1) + "px";
+
+    var done = false;
+    function close() {
+      if (done) return;
+      done = true;
+      complete.parentNode.removeChild(complete);
+    }
+    function pick() {
+      insert(completions[sel.selectedIndex]);
+      close();
+      setTimeout(function(){editor.focus();}, 50);
+    }
+    CodeMirror.connect(sel, "blur", close);
+    CodeMirror.connect(sel, "keydown", function(event) {
+      var code = event.keyCode;
+      // Enter
+      if (code == 13) {CodeMirror.e_stop(event); pick();}
+      // Escape
+      else if (code == 27) {CodeMirror.e_stop(event); close(); editor.focus();}
+      else if (code != 38 && code != 40) {
+        close(); editor.focus();
+        // Pass the event to the CodeMirror instance so that it can handle things like backspace properly.
+        editor.triggerOnKeyDown(event);
+        setTimeout(function(){CodeMirror.simpleHint(editor, getHints);}, 50);
+      }
+    });
+    CodeMirror.connect(sel, "dblclick", pick);
+
+    sel.focus();
+    // Opera sometimes ignores focusing a freshly created node
+    if (window.opera) setTimeout(function(){if (!done) sel.focus();}, 100);
+    return true;
+  };
+})();
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 683cbd94..8d7e3117 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -28,7 +28,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
     },
 
     _automaticCodeComplete: {
-        value:true
+        value:false
     },
 
     automaticCodeComplete:{