From dd9c91e14708635dfaba2b31fd7f39938f719ab3 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 27 Jun 2012 10:29:35 -0700 Subject: initialize auto code hinting flag with checkbox value, on switching between documents Signed-off-by: Ananya Sen --- js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js | 4 ++-- .../ui/code-editor-view-options.reel/code-editor-view-options.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'js') 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 97adfd13..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,7 +22,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot function insert(str) { editor.replaceRange(str, result.from, result.to); } - + //if (completions.length == 1) {insert(completions[0]); return true;} // Build the select widget diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js index 6c983867..5a33909c 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js @@ -31,6 +31,7 @@ exports.CodeEditorViewOptions = Montage.create(Component, { } else { this.visible = true; this.autocomplete = !this.codeCompletionSupport[this._currentDocument.model.file.extension]; + this._currentDocument.model.views.code.editor.automaticCodeHint = this.codeCompleteCheck.checked; } } -- cgit v1.2.3