Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

11 files changed, 850 insertions, 558 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index e7163bd8..f3c19b92 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -9,11 +9,36 @@ 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;
 
-var CodeEditorController = exports.CodeEditorController = Montage.create(Component, {
+exports.CodeEditorController = Montage.create(Component, {
     hasTemplate: {
         value: false
     },
 
+    _currentDocument: {
+        value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+
+            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();
+            }
+        }
+    },
+
     _codeEditor : {
         value:null
     },
@@ -27,13 +52,23 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
         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: {
@@ -41,17 +76,23 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
     },
 
     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);
         }
     },
@@ -91,13 +132,15 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
                            };
 
             //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) {
+
+                editorOptions.onKeyEvent = function(cm, keyEvent){
+                    self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)
+                };
 
-            var editor = self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
+            }
 
-            return editor;
+            return self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
         }
     },
 
@@ -174,61 +217,23 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
         }
     },
 
-    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.application.ninja.documentController.activeDocument.model.views.code.editor);
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.autoFormatRange(range.from, range.to);
-        }
-    },
-
     commentSelection:{
         value: function(isComment){
-            var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.model.views.code.editor);
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.commentRange(isComment, range.from, range.to);
+            var range = this.getSelectedRange(this.currentDocument.model.views.code.editor);
+            this.currentDocument.model.views.code.editor.commentRange(isComment, range.from, range.to);
         }
     },
 
     handleThemeSelection:{
         value: function(){
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.setOption("theme", this.editorTheme);
-            this.application.ninja.documentController.activeDocument.model.views.code.applyTheme("cm-s-"+this.editorTheme);
+            this.currentDocument.model.views.code.editor.setOption("theme", this.editorTheme);
+            this.currentDocument.model.views.code.applyTheme("cm-s-"+this.editorTheme);
         }
     },
 
@@ -236,10 +241,10 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
         value:function(value){
             var originalFont=13,originalLineHeight=16;
             this._zoomFactor = value;