Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/data/panels-data.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

4 files changed, 86 insertions, 288 deletions

diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 1825eb06..0d53696b 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -11,8 +11,7 @@ var Montage = 			require("montage/core/core").Montage,
     drawUtils =                 require("js/helper-classes/3D/draw-utils").DrawUtils,
     ElementPlanes =     require("js/helper-classes/3D/element-planes").ElementPlanes,
     MathUtilsClass =    require("js/helper-classes/3D/math-utils").MathUtilsClass,
-    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils,
-    DrawingToolBase =   require("js/tools/drawing-tool-base").DrawingToolBase;
+    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.StageDeps = Montage.create(Component, {
     viewUtils: {
@@ -27,24 +26,6 @@ exports.StageDeps = Montage.create(Component, {
         value: drawUtils
     },
 
-    currentStage: {
-        value: null
-    },
-    
-    _currentDocument: {
-        value: null
-    },
-
-    currentDocument: {
-        get: function() { return this._currentDocument; },
-        set: function(value) {
-            if(value) {
-                this._currentDocument = value;
-                this.currentStage = value.documentRoot;
-            }
-        }
-    },
-
     _userContentLeft: {
         value: null
     },
@@ -74,8 +55,9 @@ exports.StageDeps = Montage.create(Component, {
     deserializedFromTemplate: {
         value: function() {
 
-            this.eventManager.addEventListener( "appLoaded", this, false);
-            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener("appLoaded", this, false);
+            this.eventManager.addEventListener("openDocument", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
 
             // Initialize Deps
             // HACK
@@ -112,7 +94,9 @@ exports.StageDeps = Montage.create(Component, {
             // bind the snap properties to the snap manager
             snapManager.bindSnap();
 
-
+            drawUtils.viewUtils = viewUtils;
+            drawUtils.snapManager = snapManager;
+            drawUtils.ElementPlanes = ElementPlanes;
         }
     },
 
@@ -121,53 +105,22 @@ exports.StageDeps = Montage.create(Component, {
 
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
-
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.currentStage);
-
-            drawUtils.viewUtils = viewUtils;
-            drawUtils.snapManager = snapManager;
-            drawUtils.ElementPlanes = ElementPlanes;
-
-            snapManager._isCacheInvalid=true;
-
-            snapManager.setupDragPlaneFromPlane ( workingPlane );
-
-            DrawingToolBase.stage = this.currentStage;
-            DrawingToolBase.stageComponent = this.stage;
+            snapManager.reload2DCache();
+            snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();
         }
     },
 
-    reinitializeForSwitchDocument: {
-        value: function() {
-
+    handleSwitchDocument: {
+        value: function(){
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
+            snapManager.setupDragPlaneFromPlane (workingPlane);
+            snapManager.reload2DCache();
 
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.currentStage);
-
-            drawUtils.viewUtils = viewUtils;
-            drawUtils.snapManager = snapManager;
-            drawUtils.ElementPlanes = ElementPlanes;
-
-            snapManager._isCacheInvalid=true;
-
-            snapManager.setupDragPlaneFromPlane ( workingPlane );
-
-            DrawingToolBase.stage = this.currentStage;
-            DrawingToolBase.stageComponent = this.stage;
 
             drawUtils.initializeFromDocument();
         }
     }
-
-
-
 });
\ No newline at end of file
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index ba94fadf..2c129ee2 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -33,107 +33,10 @@ 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:{
         value: function(doc){
-            this.application.ninja.documentController._hideCurrentDocument();
-            this.application.ninja.documentController.activeDocument = doc;
-
-            if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument;
-            }
-
-            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-
-