diff options
author | Eric Guzman | 2012-06-27 15:29:41 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-27 15:29:41 -0700 |
commit | 61a41e74154715b0b42a429158fa1f2a44d2eb9a (patch) | |
tree | 2084e8df8c40708c9cc15d53d921a20718c8f006 /js/code-editor/codemirror-ninja | |
parent | 230a1a2f2848c27edf7d01f8d3a5585c8d0d4ac9 (diff) | |
parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
download | ninja-61a41e74154715b0b42a429158fa1f2a44d2eb9a.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'js/code-editor/codemirror-ninja')
-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"); |