49 files changed, 503 insertions, 219 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/code-editor/code-editor-wrapper.js
index f3c19b92..942bd5cd 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/code-editor/code-editor-wrapper.js
@@ -9,7 +9,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =           require("montage/core/core").Montage,
     Component =         require("montage/ui/component").Component;
 
-exports.CodeEditorController = Montage.create(Component, {
+exports.CodeEditorWrapper = Montage.create(Component, {
     hasTemplate: {
         value: false
     },
@@ -32,8 +32,9 @@ exports.CodeEditorController = Montage.create(Component, {
             if(!value) {
 
             } else if(this._currentDocument.currentView === "code") {
-                this.autocomplete = !this.codeCompletionSupport[this._currentDocument.model.file.extension];
+                this.autocomplete = this.codeCompletionSupport[this._currentDocument.model.file.extension];
                 this._currentDocument.model.views.code.editor.focus();
+
                 this.applySettings();
             }
         }
@@ -56,21 +57,6 @@ exports.CodeEditorController = Montage.create(Component, {
         value: false
     },
 
-    _automaticCodeComplete: {
-        value:false
-    },
-
-    automaticCodeComplete:{
-        get: function(){
-            return this._automaticCodeComplete;
-        },
-        set: function(value) {
-            if(this._automaticCodeComplete !== value) {
-                this._automaticCodeComplete = value;
-            }
-        }
-    },
-
     _editorTheme: {
         value:"default"
     },
@@ -93,7 +79,10 @@ exports.CodeEditorController = Montage.create(Component, {
             return this._zoomFactor;
         },
         set: function(value) {
-            this.handleZoom(value);
+            if(value !== this._zoomFactor){
+                this._zoomFactor = value;
+                this.handleZoom(value);
+            }
         }
     },
 
@@ -112,6 +101,10 @@ exports.CodeEditorController = Montage.create(Component, {
         value:function(codeDocumentView, type, documentType, textDocument){
             var self = this, editorOptions = null;
 
+            if(!this.application.ninja.editorViewOptions.codeEditorWrapper){
+                this.application.ninja.editorViewOptions.codeEditorWrapper = this;
+            }
+
             editorOptions = {
                                lineNumbers: true,
                                matchBrackets:true,
@@ -132,6 +125,9 @@ exports.CodeEditorController = Montage.create(Component, {
                            };
 
             //configure auto code completion if it is supported for that document type
+
+            this.autocomplete = this.codeCompletionSupport[documentType];
+
             if(this.autocomplete) {
 
                 editorOptions.onKeyEvent = function(cm, keyEvent){
@@ -163,7 +159,7 @@ exports.CodeEditorController = Montage.create(Component, {
             }
 
             //===manually triggered code completion
-            if((this.automaticCodeComplete === false)){
+            if((this.currentDocument.model.views.code.editor.automaticCodeHint === false)){
                 if(keyEvent.ctrlKey && keyEvent.keyCode === 32){//Ctrl+Space
                     this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint);
                 }
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");
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 4448e1f1..9871525b 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,12 +11,13 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{