Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

2 files changed, 53 insertions, 150 deletions

diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 757c5e51..2c129ee2 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -33,81 +33,6 @@ exports.StageView = Montage.create(Component, {
 
     /**
      * Public method
-     * Creates a textarea element which will contain the content of the opened text document.
-     */
-    createTextAreaElement: {
-        value: function(uuid) {
-            var codeMirrorDiv = document.createElement("div");
-            codeMirrorDiv.id = "codeMirror_"  + uuid;
-            codeMirrorDiv.style.display = "block";
-            this.element.appendChild(codeMirrorDiv);
-
-            var textArea = document.createElement("textarea");
-            textArea.id = "code";
-            textArea.name = "code";
-            codeMirrorDiv.appendChild(textArea);
-
-            return textArea;
-        }
-    },
-
-    /**
-     * Public method
-     * Creates a new instance of a code editor
-     */
-    createTextView: {
-        value: function(doc) {
-            var type;
-            this.application.ninja.documentController._hideCurrentDocument();
-            this.hideOtherDocuments(doc.uuid);
-
-            switch(doc.documentType) {
-                case  "css" :
-                    type = "css";
-                    break;
-                case "js" :
-                    type = "javascript";
-                    break;
-                case "html" :
-                    type = "htmlmixed";
-                    break;
-                case "json" :
-                    type = "javascript";
-                    break;
-                case "php" :
-                    type = "php";
-                    break;
-                case "pl" :
-                    type = "perl";
-                    break;
-                case "py" :
-                    type = "python";
-                    break;
-                case "rb" :
-                    type = "ruby";
-                    break;
-                case "xml" :
-                    type = "xml";
-                    break;
-            }
-            document.getElementById("codeMirror_"+doc.uuid).style.display="block";
-
-            doc.editor = this.application.ninja.codeEditorController.createEditor(doc, type, doc.documentType);
-            doc.editor.hline = doc.editor.setLineClass(0, "activeline");
-
-            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-            this.application.ninja.documentController.activeDocument = doc;
-            this.application.ninja.stage.hideCanvas(true);
-            document.getElementById("iframeContainer").style.display="none";//hide the iframe when switching to code view
-
-            this.showCodeViewBar(true);
-            this.application.ninja.codeEditorController.applySettings();
-            this.collapseAllPanels();
-        }
-    },
-
-    /**
-     * Public method
      * Switches between documents. Document state data is saved and restored whereever applicable
      */
     switchDocument:{
@@ -133,62 +58,5 @@ exports.StageView = Montage.create(Component, {
 
             NJevent("switchDocument");
         }
-    },
-
-    /**
-     * Public method
-     * Switches between different views of a design document, like HTML design view, HTML code view
-     */
-    switchDesignDocViews: {
-        value: function() {
-            //TODO
-        }
-    },
-
-    showRulers:{
-        value:function(){
-            this.application.ninja.rulerTop.style.display = "block";
-            this.application.ninja.rulerLeft.style.display = "block";
-        }
-    },
-    hideRulers:{
-        value:function(){
-            this.application.ninja.rulerTop.style.display = "none";
-            this.application.ninja.rulerLeft.style.display = "none";
-        }
-    },
-    showCodeViewBar:{
-        value:function(isCodeView){
-            if(isCodeView === true) {
-                this.application.ninja.editorViewOptions.element.style.display = "block";
-                this.application.ninja.documentBar.element.style.display = "none";
-            } else {
-                this.application.ninja.documentBar.element.style.display = "block";
-                this.application.ninja.editorViewOptions.element.style.display = "none";
-            }
-        }
-    },
-
-    collapseAllPanels:{
-        value:function(){
-            this.application.ninja.panelSplitter.collapse();
-            this.application.ninja.timelineSplitter.collapse();
-            this.application.ninja.toolsSplitter.collapse();
-            this.application.ninja.optionsSplitter.collapse();
-        }
-    },
-    restoreAllPanels:{
-        value:function(){
-            this.application.ninja.panelSplitter.restore();
-            this.application.ninja.timelineSplitter.restore();
-            this.application.ninja.toolsSplitter.restore();
-            this.application.ninja.optionsSplitter.restore();
-        }
-    },
-
-    applyTheme:{
-        value:function(themeClass){
-            this.element.className = "codeViewContainer "+themeClass;
-        }
     }
 });
\ No newline at end of file
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 73d3aaf4..69cfa7ba 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -468,26 +468,19 @@ exports.Stage = Montage.create(Component, {
      */
     handleScroll: {
         value: function() {
-             // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
-                this._scrollLeft = this._iframeContainer.scrollLeft;
-                this._scrollTop = this._iframeContainer.scrollTop;
 
-                this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
-                this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
-            } else {
-                this._scrollLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft;
-                this._scrollTop = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop;
+            this._scrollLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft;
+            this._scrollTop = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop;
 
-                this.userContentLeft = this._documentOffsetLeft - this._scrollLeft;
-                this.userContentTop = this._documentOffsetTop - this._scrollTop;
+            this.userContentLeft = this._documentOffsetLeft - this._scrollLeft;
+            this.userContentTop = this._documentOffsetTop - this._scrollTop;
+
+            // TODO - scroll events are not dependable.  We may need to use a timer to simulate
+            // scrollBegin and scrollEnd. For now, the Pan Tool will keep track of the stage's scroll values
+            // on mouse down.
+            // this._maxHorizontalScroll = this.application.ninja.currentDocument.documentRoot.scrollWidth - this._canvas.width - 11;
+            // this._maxVerticalScroll = this.application.ninja.currentDocument.documentRoot.scrollHeight - this._canvas.height - 11;
 
-                // TODO - scroll events are not dependable.  We may need to use a timer to simulate
-                // scrollBegin and scrollEnd. For now, the Pan Tool will keep track of the stage's scroll values
-                // on mouse down.
-//                this._maxHorizontalScroll = this.application.ninja.currentDocument.documentRoot.scrollWidth - this._canvas.width - 11;
-//                this._maxVerticalScroll = this.application.ninja.currentDocument.documentRoot.scrollHeight - this._canvas.height - 11;
-            }
 
             // Need to clear the snap cache and set up the drag plane
             //snapManager.setupDragPlaneFromPlane( workingPlane );
@@ -1012,5 +1005,47 @@ exports.Stage = Montage.create(Component, {
            this._iframeContainer.scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
            this._scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
        }
-   }
+   },
+
+    showRulers:{
+        value:function(){
+            this.application.ninja.rulerTop.style.display = "block";
+            this.application.ninja.rulerLeft.style.display = "block";
+        }
+    },
+    hideRulers:{
+        value:function(){
+            this.application.ninja.rulerTop.style.display = "none";
+            this.application.ninja.rulerLeft.style.display = "none";
+        }
+    },
+    showCodeViewBar:{
+        value:function(isCodeView){
+            if(isCodeView === true) {
+                this.application.ninja.editorViewOptions.element.style.display = "block";
+                this.application.ninja.documentBar.element.style.display = "none";
+            } else {
+                this.application.ninja.documentBar.element.style.display = "block";
+                this.application.ninja.editorViewOptions.element.style.display = "none";
+            }
+        }