diff options
author | Kruti Shah | 2012-06-27 12:41:35 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-27 12:41:35 -0700 |
commit | 37fd59d6574b4230df5ff8022e300d8d310c380d (patch) | |
tree | a92e3c27e7fd6c9db942d99c3d91035a8230cdea /js/code-editor/codemirror-ninja/lib | |
parent | f57b0fe3640dbb4aa2e355d165225bc267c134c2 (diff) | |
parent | 8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff) | |
download | ninja-37fd59d6574b4230df5ff8022e300d8d310c380d.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/code-editor/codemirror-ninja/lib')
-rw-r--r-- | js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js | 6 |
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 | |||
13 | 13 | ||
14 | // Ninja override: don't show code hinting if the token is empty | 14 | // Ninja override: don't show code hinting if the token is empty |
15 | var tempToken = editor.getTokenAt(editor.getCursor()); | 15 | var tempToken = editor.getTokenAt(editor.getCursor()); |
16 | if(tempToken && ((tempToken.string === "") || !(/[\S]/gi.test(tempToken.string)))) return;//check that token has only spaces | 16 | if(!(/[\S]/gi.test(tempToken.string))) return; |
17 | 17 | ||
18 | 18 | ||
19 | var result = getHints(editor); | 19 | var result = getHints(editor); |
@@ -22,8 +22,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
22 | function insert(str) { | 22 | function insert(str) { |
23 | editor.replaceRange(str, result.from, result.to); | 23 | editor.replaceRange(str, result.from, result.to); |
24 | } | 24 | } |
25 | // Ninja override: don't autocomplete to reduce user's typing errors | 25 | |
26 | // if (completions.length == 1) {insert(completions[0]); return true;} | 26 | //if (completions.length == 1) {insert(completions[0]); return true;} |
27 | 27 | ||
28 | // Build the select widget | 28 | // Build the select widget |
29 | var complete = document.createElement("div"); | 29 | var complete = document.createElement("div"); |