Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/selection-controller.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/helper-classes/backup-delete/GLBrushStroke.js
	js/helper-classes/backup-delete/GLCircle.js
	js/helper-classes/backup-delete/GLGeomObj.js
	js/helper-classes/backup-delete/GLRectangle.js
	js/helper-classes/backup-delete/GLSubpath.js
	js/helper-classes/backup-delete/GLWorld.js
	js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
	js/helper-classes/backup-delete/Materials/DeformMaterial.js
	js/helper-classes/backup-delete/Materials/FlatMaterial.js
	js/helper-classes/backup-delete/Materials/FlyMaterial.js
	js/helper-classes/backup-delete/Materials/JuliaMaterial.js
	js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
	js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
	js/helper-classes/backup-delete/Materials/MandelMaterial.js
	js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
	js/helper-classes/backup-delete/Materials/PulseMaterial.js
	js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js
	js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
	js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/StarMaterial.js
	js/helper-classes/backup-delete/Materials/TaperMaterial.js
	js/helper-classes/backup-delete/Materials/TunnelMaterial.js
	js/helper-classes/backup-delete/Materials/TwistMaterial.js
	js/helper-classes/backup-delete/Materials/TwistVertMaterial.js
	js/helper-classes/backup-delete/Materials/UberMaterial.js
	js/helper-classes/backup-delete/Materials/WaterMaterial.js
	js/helper-classes/backup-delete/Materials/ZInvertMaterial.js
	js/lib/drawing/world.js
	js/preloader/Preloader.js
	js/stage/layout.js

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

1 files changed, 19 insertions, 22 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 8a53a08b..6be2df1d 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -64,31 +64,17 @@ exports.Layout = Montage.create(Component, {
 
     handleOpenDocument: {
         value: function() {
-            // Initial elements to draw is the entire node list
-            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
-                this.elementsToDraw = this.application.ninja.documentController.activeDocument._liveNodeList;
+            // 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;
             }
+
             // Draw the elements and the 3d info
             this.draw();
             this.draw3DInfo(false);
         }
     },
 
-    // No need to keep track of the added elements. We now have a live node list of the dom
-    handleElementAdded: {
-        value: function(event) {
-            // this.domTree.push(event.detail);
-            // this.draw();
-            // this.draw3DInfo(false);
-        }
-    },
-
-    handleElementDeleted: {
-        value: function(event) {
-            //this.domTree.splice(this.domTree.indexOf(event.detail), 1);
-        }
-    },
-
     // Redraw stage only once after all deletion is completed
     handleDeleteSelection: {
         value: function(event) {
@@ -99,14 +85,25 @@ exports.Layout = Montage.create(Component, {
 
     handleSelectionChange: {
         value: function(event) {
+            var containerIndex;
 
             if(this.application.ninja.documentController.activeDocument === null){
                 return;
             }
 
-            // Make an array copy of the line node list which is not an array like object
-            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
+            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);
+                // Index of the current container
+                containerIndex = this.domTree.indexOf(this.application.ninja.currentSelectedContainer);
+
+                if(containerIndex < 0) {
+                    // Stage is the container.
+                    this.domTree = Array.prototype.slice.call(this.application.ninja.currentSelectedContainer.childNodes, 0);
+                } else {
+                    // Child nodes of the container
+                    this.domTree = Array.prototype.slice.call(this.domTree[containerIndex].childNodes, 0);
+                }
             }
             // Clear the elements to draw
             this.elementsToDraw.length = 0;
@@ -119,10 +116,10 @@ exports.Layout = Montage.create(Component, {
                     return (tmp.indexOf(value) === -1);
                 });
             } else {
-                this.elementsToDraw = this.domTree;
+                this.elementsToDraw = Array.prototype.slice.call(this.domTree, 0);
             }
 
-            this.draw(); // Not a reel yet :)
+            this.draw(); // Not a reel yet
             this.draw3DInfo(false);
 
             // Clear the domTree copy