Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/io/system/ninjalibrary.json

5 files changed, 190 insertions, 370 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 0a76dbe5..460c8b4a 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -62,12 +62,8 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             // Initial elements to draw are the childrens of the root element
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.elementsToDraw = this.application.ninja.documentController.activeDocument.documentRoot.childNodes;
+                this.elementsToDraw = this.application.ninja.documentController.activeDocument.model.documentRoot.childNodes;
             }
-
-            // Draw the elements and the 3d info
-            this.draw();
-            this.draw3DInfo(false);
         }
     },
 
@@ -89,7 +85,7 @@ exports.Layout = Montage.create(Component, {
 
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){
                 // Make an array copy of the line node list which is not an array like object
-                this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
+                this.domTree = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true);
                 // Index of the current container
                 containerIndex = this.domTree.indexOf(this.application.ninja.currentSelectedContainer);
 
@@ -156,7 +152,7 @@ exports.Layout = Montage.create(Component, {
     drawTagOutline: {
         value: function (item) {
 
-            if(!item || (item.nodeType !== 1)) return;
+            if(!item || !this.application.ninja.selectionController.isNodeTraversable(item)) return;
 
             // TODO Bind the layoutview mode to the current document
             // var mode  = this.application.ninja.currentDocument.layoutMode;
@@ -241,7 +237,7 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             if(this.application.ninja.currentDocument) {
                 this.clearCanvas();
-                this.WalkDOM(this.application.ninja.currentDocument.documentRoot);
+                this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot);
 
                 //drawUtils.updatePlanes();
                 //if(this.application.ninja.currentDocument.draw3DGrid) drawUtils.drawWorkingPlane();
@@ -253,7 +249,7 @@ exports.Layout = Montage.create(Component, {
     drawElementsOutline: {
         value: function(elements) {
             this.clearCanvas();
-            this.WalkDOM(this.application.ninja.currentDocument.documentRoot, elements);
+            this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot, elements);
         }
     },
 
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index a71b77be..896d4a5b 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,55 +26,10 @@ 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
-    },
-
-    userContentLeft: {
-        get: function() { return this._userContentLeft; },
-        set: function(value) {
-            if(value) {
-                viewUtils.setUserContentLeft(value);
-            }
-        }
-    },
-
-    _userContentTop: {
-        value: null
-    },
-
-    userContentTop: {
-        get: function() { return this._userContentTop; },
-        set: function(value) {
-            if(value) {
-                viewUtils.setUserContentTop(value);
-            }
-        }
-    },
-
     deserializedFromTemplate: {
         value: function() {
 
-            this.eventManager.addEventListener( "appLoaded", this, false);
-            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener("appLoaded", this, false);
 
             // Initialize Deps
             // HACK
@@ -94,31 +48,14 @@ exports.StageDeps = Montage.create(Component, {
 
     handleAppLoaded: {
         value: function() {
-
-            Object.defineBinding(this, "currentDocument", {
-                boundObject: this.application.ninja,
-                boundObjectPropertyPath: "currentDocument",
-                oneway: true
-            });
-
-            Object.defineBinding(this, "userContentLeft", {
-                boundObject: this.stage,
-                boundObjectPropertyPath: "_userContentLeft",
-                oneway: true
-            });
-
-            Object.defineBinding(this, "userContentTop", {
-                boundObject: this.stage,
-                boundObjectPropertyPath: "_userContentTop",
-                oneway: true
-            });
-
             // Setup the snap manager pointer to the app model
             snapManager.appModel = this.application.ninja.appModel;
             // bind the snap properties to the snap manager
             snapManager.bindSnap();
 
-
+            drawUtils.viewUtils = viewUtils;
+            drawUtils.snapManager = snapManager;
+            drawUtils.ElementPlanes = ElementPlanes;
         }
     },
 
@@ -127,53 +64,21 @@ 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._isCacheInvalid = true;
+            snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();
         }
     },
 
-    reinitializeForSwitchDocument: {
-        value: function() {
-
+    handleSwitchDocument: {
+        value: function(){
             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._isCacheInvalid = true;
+            snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();