Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

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

8 files changed, 194 insertions, 276 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 460c8b4a..71296405 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -23,6 +23,30 @@ exports.Layout = Montage.create(Component, {
     drawFillColor: { value: 'rgba(255,255,255,1)' },
     ctxLineWidth: { value: 0.2 },
 
+    _currentDocument: {
+        value : null,
+        enumerable : false
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {// || value.getProperty("currentView") !== "design") {
+                return;
+            }
+
+            this._currentDocument = value;
+
+            if(!value) {
+
+            } else if(this._currentDocument.currentView === "design") {
+                this.elementsToDraw = this._currentDocument.model.documentRoot.childNodes;
+            }
+        }
+    },
+
     _layoutView: {
         value: "layoutAll"
     },
@@ -58,15 +82,6 @@ exports.Layout = Montage.create(Component, {
         }
     },
 
-    handleOpenDocument: {
-        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.model.documentRoot.childNodes;
-            }
-        }
-    },
-
     // Redraw stage only once after all deletion is completed
     handleElementsRemoved: {
         value: function(event) {
@@ -79,11 +94,11 @@ exports.Layout = Montage.create(Component, {
         value: function(event) {
             var containerIndex;
 
-            if(this.application.ninja.documentController.activeDocument === null){
+            if(this.currentDocument === null){
                 return;
             }
 
-            if(this.application.ninja.documentController.activeDocument.currentView === "design"){
+            if(this.currentDocument.currentView === "design"){
                 // Make an array copy of the line node list which is not an array like object
                 this.domTree = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true);
                 // Index of the current container
@@ -121,6 +136,10 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             this.clearCanvas();
 
+            // TODO Bind the layoutview mode to the current document
+            // var mode  = this.application.ninja.currentDocument.layoutMode;
+            if(this.layoutView === "layoutOff") return;
+
             var els = this.elementsToDraw.length;
             for(var i = 0, el; i < els; i++){
                 this.drawTagOutline(this.elementsToDraw[i]);
@@ -132,13 +151,13 @@ exports.Layout = Montage.create(Component, {
         value: function(updatePlanes) {
             if(updatePlanes) {
                 drawUtils.updatePlanes();
+                this.application.ninja.stage.stageDeps.snapManager._isCacheInvalid = true;
             }
 
             if(this.stage.appModel.show3dGrid) {
                 this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView();
-                drawUtils.drawWorkingPlane();
             }
-
+            drawUtils.drawWorkingPlane();
             drawUtils.draw3DCompass();
         }
     },
@@ -154,11 +173,6 @@ exports.Layout = Montage.create(Component, {
 
             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;
-
-            if(this.layoutView === "layoutOff") return;
-            
             // Don't draw outlines for shapes.
             // TODO Use the element mediator/controller/model to see if its a shape
             // if (utilsModule.utils.isElementAShape(item)) return;
@@ -219,7 +233,7 @@ exports.Layout = Montage.create(Component, {
             if(this.layoutView === "layoutAll") {
                 this.ctx.strokeStyle = 'rgba(0,0,0,1)'; // Black Stroke
                 this.ctx.strokeRect(bounds3D[0][0]+5.5, bounds3D[0][1]-15.5, 70, 11);
-                this.ctx.fillStyle = 'rgba(255,255,255,1)' // White Fill
+                this.ctx.fillStyle = 'rgba(255,255,255,1)'; // White Fill
                 this.ctx.fillRect(bounds3D[0][0]+6, bounds3D[0][1]-15, 69, 10);
 
                 this.ctx.fillStyle = 'rgba(0,0,0,1)';
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 896d4a5b..762c2529 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -14,6 +14,7 @@ var Montage = 			require("montage/core/core").Montage,
     VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.StageDeps = Montage.create(Component, {
+
     viewUtils: {
         value: viewUtils
     },
@@ -37,8 +38,6 @@ exports.StageDeps = Montage.create(Component, {
             window.MathUtils   = MathUtilsClass;
             window.VecUtils   = VecUtils;
 
-            snapManager.drawingCanvas = this.stage.drawingCanvas;
-
             // Setup the listeners for the draw-util and snapmanager when removing elements
             // TODO Revisit when supporting multiple documents
             drawUtils.initialize();
@@ -57,28 +56,6 @@ exports.StageDeps = Montage.create(Component, {
             drawUtils.snapManager = snapManager;
             drawUtils.ElementPlanes = ElementPlanes;
         }
-    },
-
-    handleOpenDocument: {
-        value: function() {
-
-            workingPlane = [0,0,1,0];
-
-            snapManager._isCacheInvalid = true;
-            snapManager.setupDragPlaneFromPlane (workingPlane);
-
-            drawUtils.initializeFromDocument();
-        }
-    },
-
-    handleSwitchDocument: {
-        value: function(){
-            workingPlane = [0,0,1,0];
-
-            snapManager._isCacheInvalid = true;
-            snapManager.setupDragPlaneFromPlane (workingPlane);
-
-            drawUtils.initializeFromDocument();
-        }
     }
+
 });
\ No newline at end of file
diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
deleted file mode 100755
index 8afb52a2..00000000
--- a/js/stage/stage-view.reel/stage-view.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-.codeViewContainer {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  margin: 0px;
-  padding: 0px;
-  background-color: #ffffff;
-  width: 100%;
-  height: 100%;
-  overflow:auto;
-  cursor:text;
-}
-
-.codeViewContainer .CodeMirror {
-    width: 100%;
-    height: 100%;
-    background: white;
-}
-
-.codeViewContainer .CodeMirror-scroll {
-    height: 100%;
-    overflow: auto;
-}
-
-.codeViewContainer>div{
-    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
-}
-
-span.CodeMirror-matchhighlight { background: #e9e9e9 }
-.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }
-div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;}
-.CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);}