Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 3 insertions, 3 deletions

diff --git a/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js b/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js
index 4787b4f8..99fe2d21 100644
--- a/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js
+++ b/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js
@@ -13,7 +13,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
     // Ninja override: don't show code hinting if the token is empty
     var tempToken = editor.getTokenAt(editor.getCursor());
-    if(tempToken && ((tempToken.string === "") || !(/[\S]/gi.test(tempToken.string)))) return;//check that token has only spaces
+    if(!(/[\S]/gi.test(tempToken.string))) return;
 
 
     var result = getHints(editor);
@@ -22,8 +22,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     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;}
+
+    //if (completions.length == 1) {insert(completions[0]); return true;}
 
     // Build the select widget
     var complete = document.createElement("div");