Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix

Conflicts:
	js/stage/stage.reel/stage.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

2 files changed, 31 insertions, 73 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index d292f838..f3c19b92 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -32,6 +32,7 @@ exports.CodeEditorController = Montage.create(Component, {
             if(!value) {
 
             } else if(this._currentDocument.currentView === "code") {
+                this.autocomplete = !this.codeCompletionSupport[this._currentDocument.model.file.extension];
                 this._currentDocument.model.views.code.editor.focus();
                 this.applySettings();
             }
@@ -51,13 +52,23 @@ exports.CodeEditorController = Montage.create(Component, {
         value: {"js": true}
     },
 
+    autocomplete: {
+        value: false
+    },
+
     _automaticCodeComplete: {
         value:false
     },
 
     automaticCodeComplete:{
-        get: function(){return this._automaticCodeComplete;},
-        set: function(value){this._automaticCodeComplete = value;}
+        get: function(){
+            return this._automaticCodeComplete;
+        },
+        set: function(value) {
+            if(this._automaticCodeComplete !== value) {
+                this._automaticCodeComplete = value;
+            }
+        }
     },
 
     _editorTheme: {
@@ -65,17 +76,23 @@ exports.CodeEditorController = Montage.create(Component, {
     },
 
     editorTheme:{
-        get: function(){return this._editorTheme;},
-        set: function(value){this._editorTheme = value;}
+        get: function(){
+            return this._editorTheme;
+        },
+        set: function(value){
+            this._editorTheme = value;
+        }
     },
 
-    _zoomFactor:{
+    _zoomFactor: {
         value:100
     },
 
     zoomFactor:{
-        get: function(){return this._zoomFactor;},
-        set: function(value){
+        get: function() {
+            return this._zoomFactor;
+        },
+        set: function(value) {
             this.handleZoom(value);
         }
     },
@@ -115,13 +132,15 @@ exports.CodeEditorController = Montage.create(Component, {
                            };
 
             //configure auto code completion if it is supported for that document type
-            if(this.codeCompletionSupport[documentType] === true){
-                editorOptions.onKeyEvent = function(cm, keyEvent){self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)};
-            }
+            if(this.autocomplete) {
 
-            var editor = self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
+                editorOptions.onKeyEvent = function(cm, keyEvent){
+                    self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)
+                };
 
-            return editor;
+            }
+
+            return self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
         }
     },
 
@@ -198,50 +217,12 @@ exports.CodeEditorController = Montage.create(Component, {
         }
     },
 
-    handleCodeCompletionSupport:{
-        value:function(fileType){
-            var autoCodeCompleteElem = document.getElementsByClassName("autoCodeComplete")[0], elems=null, i=0;
-            if(autoCodeCompleteElem){
-                elems = autoCodeCompleteElem.getElementsByTagName("*");
-            }
-
-            if(elems && (this.codeCompletionSupport[fileType] === true)){
-                //enable elements
-                for(i=0;i<elems.length;i++){
-                    if(elems[i].hasAttribute("disabled")){
-                        elems[i].removeAttribute("disabled");
-                    }
-                    if(elems[i].classList.contains("disabled")){
-                        elems[i].classList.remove("disabled");
-                    }
-                }
-            }else if(elems && !this.codeCompletionSupport[fileType]){
-                //disable elements
-                for(i=0;i<elems.length;i++){
-                    if(!elems[i].hasAttribute("disabled")){
-                        elems[i].setAttribute("disabled", "disabled");
-                    }
-                    if(!elems[i].classList.contains("disabled")){
-                        elems[i].classList.add("disabled");
-                    }
-                }
-            }
-        }
-    },
-
     getSelectedRange:{
         value:function(editor){
             return { from: editor.getCursor(true), to: editor.getCursor(false) };
         }
     },
 
-    autoFormatSelection:{
-        value: function(){
-            var range = this.getSelectedRange(this.currentDocument.model.views.code.editor);
-            this.currentDocument.model.views.code.editor.autoFormatRange(range.from, range.to);
-        }
-    },
-
     commentSelection:{
         value: function(isComment){
             var range = this.getSelectedRange(this.currentDocument.model.views.code.editor);
@@ -271,8 +252,6 @@ exports.CodeEditorController = Montage.create(Component, {
         value:function(){
             //set theme
             this.handleThemeSelection();
-            //check autocomplete support
-            this.handleCodeCompletionSupport(this.currentDocument.model.file.extension);
             //set zoom
             this.handleZoom(this._zoomFactor);
         }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 0fe1636a..a90375af 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -348,26 +348,5 @@ exports.DocumentController = Montage.create(Component, {
         value: function(document) {
             document.closeDocument(this.application.ninja, this.application.ninja.closeFile);
         }
-    },
-
-    switchDocuments: {
-        value: function(currentDocument, newDocument, didCreate) {
-
-            if(currentDocument.currentView === "design") {
-                currentDocument.serializeDocument();
-            }
-
-            if(didCreate) {
-                if(newDocument.currentView === "design") {
-
-                } else {
-                    newDocument.model.parentContainer.style["display"] = "block";
-                }
-            } else {
-                if(newDocument.currentView === "design") {
-                    newDocument.deserializeDocument();
-                }
-            }
-        }
     }
 });