Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

7 files changed, 476 insertions, 393 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 7913cfc1..e7163bd8 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -68,7 +68,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
      * Creates an editor instance
      */
     createEditor : {
-        value:function(doc, type, documentType){
+        value:function(codeDocumentView, type, documentType, textDocument){
             var self = this, editorOptions = null;
 
             editorOptions = {
@@ -76,17 +76,17 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
                                matchBrackets:true,
                                mode: type,
                                onChange: function(){
-                                   var historySize = doc.editor.historySize();
+                                   var historySize = codeDocumentView.editor.historySize();
                                    if(historySize.undo>0){
-                                        doc.needsSave = true;
+                                       textDocument.model.needsSave = true;
                                    }else if(historySize.undo===0 && historySize.redo>0){
-                                       doc.needsSave = false;
+                                       textDocument.model.needsSave = false;
                                    }
                                },
                                onCursorActivity: function() {
-                                   doc.editor.matchHighlight("CodeMirror-matchhighlight");
-                                   doc.editor.setLineClass(doc.editor.hline, null, null);
-                                   doc.editor.hline = doc.editor.setLineClass(doc.editor.getCursor().line, null, "activeline");
+                                   codeDocumentView.editor.matchHighlight("CodeMirror-matchhighlight");
+                                   codeDocumentView.editor.setLineClass(codeDocumentView.editor.hline, null, null);
+                                   codeDocumentView.editor.hline = codeDocumentView.editor.setLineClass(codeDocumentView.editor.getCursor().line, null, "activeline");
                                }
                            };
 
@@ -95,9 +95,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
                 editorOptions.onKeyEvent = function(cm, keyEvent){self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)};
             }
 
-            var editor = self.codeEditor.fromTextArea(doc.textArea, editorOptions);
-
-            //editor.setOption("theme", "night");
+            var editor = self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
 
             return editor;
         }
@@ -215,22 +213,22 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
 
     autoFormatSelection:{
         value: function(){
-            var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.editor);
-            this.application.ninja.documentController.activeDocument.editor.autoFormatRange(range.from, range.to);
+            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.editor);
-            this.application.ninja.documentController.activeDocument.editor.commentRange(isComment, range.from, range.to);
+            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);
         }
     },
 
     handleThemeSelection:{
         value: function(){
-            this.application.ninja.documentController.activeDocument.editor.setOption("theme", this.editorTheme);
-            this.application.ninja.stage.stageView.applyTheme("cm-s-"+this.editorTheme);
+            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);
         }
     },
 
@@ -238,10 +236,10 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
         value:function(value){
             var originalFont=13,originalLineHeight=16;
             this._zoomFactor = value;
-            this.application.ninja.documentController.activeDocument.container.style.fontSize = ""+((value/100)*originalFont)+"px";
-            this.application.ninja.documentController.activeDocument.container.style.cursor = "text";
-            this.application.ninja.documentController.activeDocument.container.querySelector(".CodeMirror").style.lineHeight = ""+((value/100)*originalLineHeight)+"px";
-            this.application.ninja.documentController.activeDocument.editor.refresh();//refresh editor display for xoom
+            this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.style.fontSize = ""+((value/100)*originalFont)+"px";
+            this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.style.cursor = "text";
+            this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.querySelector(".CodeMirror").style.lineHeight = ""+((value/100)*originalLineHeight)+"px";
+            this.application.ninja.documentController.activeDocument.model.views.code.editor.refresh();//refresh editor display for xoom
         }
     },
 
@@ -250,7 +248,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
             //set theme
             this.handleThemeSelection();
             //check autocomplete support
-            this.handleCodeCompletionSupport(this.application.ninja.documentController.activeDocument.documentType);
+            this.handleCodeCompletionSupport(this.application.ninja.documentController.activeDocument.model.file.extension);
             //set zoom
             this.handleZoom(this._zoomFactor);
         }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index c6bf4c6b..2c34eedf 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,31 +9,18 @@ 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,
     Uuid =                      require("montage/core/uuid").Uuid,
-    HTMLDocument =      require("js/document/html-document").HTMLDocument,
-    TextDocument =      require("js/document/text-document").TextDocument;
-
-    // New Document Objects
-var Document =      require("js/document/document-html").HtmlDocument;
+    HTMLDocument =  require("js/document/document-html").HtmlDocument,
+    TextDocument =  require("js/document/document-text").TextDocument;
 ////////////////////////////////////////////////////////////////////////
 //
-var DocumentController = exports.DocumentController = Montage.create(Component, {
-    hasTemplate: {
-        value: false
-    },
-
-    webTemplate: {
-        value: false
-    },
-
-    _documents: {
-        value: []
-    },
-    
-    _hackRootFlag: {
-        value: false
-    },
-
+exports.DocumentController = Montage.create(Component, {
+        //
+    hasTemplate: {value: false},
+    _documents: {value: []},
+        //TODO: what is this?!?!
+    _hackInitialStyles: {value: true},
     _activeDocument: { value: null },
+    //TODO: Are any of these needed?
     _iframeCounter: { value: 1, enumerable: false },
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
@@ -44,21 +31,19 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             return this._activeDocument;
         },
         set: function(doc) {
-            if(!!this._activeDocument){ this._activeDocument.isActive = false;}
+                        //if(!!this._activeDocument){ this._activeDocument.isActive = false;}
+
             this._activeDocument = doc;
+
             if(!!this._activeDocument){
                 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
                 this._activeDocument.isActive = true;
-
-                if(!!this._activeDocument.editor){
-                    this._activeDocument.editor.focus();
-                }
             }
         }
     },
 
     deserializedFromTemplate: {
-        value: function() {
+        value: function() { //TODO: Add event naming consistency (save, fileOpen and newFile should be consistent, all file events should be executeFile[operation name])
             this.eventManager.addEventListener("appLoaded", this, false);
             this.eventManager.addEventListener("executeFileOpen", this, false);
             this.eventManager.addEventListener("executeNewFile", this, false);
@@ -69,37 +54,30 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeFileCloseAll", this, false);
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
-            
-            this.eventManager.addEventListener("addComponentFirstDraw", this, false);