4 files changed, 69 insertions, 25 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index de4c67c1..6be2df1d 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -64,8 +64,10 @@ exports.Layout = Montage.create(Component, {
 
     handleOpenDocument: {
         value: function() {
-            // Initial elements to draw is the entire node list
-            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();
@@ -73,21 +75,6 @@ exports.Layout = Montage.create(Component, {
         }
     },
 
-    // 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) {
@@ -98,14 +85,26 @@ 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
-            this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
+            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;
 
@@ -117,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
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 91047e51..ad67cada 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -125,6 +125,10 @@ exports.StageView = Montage.create(Component, {
 
             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
             this.application.ninja.documentController._showCurrentDocument();
 
@@ -135,7 +139,6 @@ exports.StageView = Montage.create(Component, {
 
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
                 this.application.ninja.stage._scrollFlag = true; // TODO HACK to prevent type error on Hide/Show Iframe
-                this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument;
 
                 //reinitialize draw-util, snapmanager and view-util
                 this.application.ninja.stage.stageDeps.reinitializeForSwitchDocument();
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 812e3d55..f796303c 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -50,6 +50,10 @@
                     "element" : {"#": "textToolObject"}
                 }
             },
+
+            "focusManager": {
+                "object": "js/components/focus-manager.reel"
+            },
             
             "owner": {
                 "module": "js/stage/stage.reel",
@@ -63,7 +67,8 @@
                     "stageDeps": {"@": "StageDeps1"},
                     "layout":   {"@": "layout1"},
                                         "stageView": {"@": "stageView"},
-                    "textTool": {"@": "textTool"}
+                    "textTool": {"@": "textTool"},
+                    "focusManager": {"@": "focusManager"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 4c1d046b..00b72490 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -170,8 +170,7 @@ exports.Stage = Montage.create(Component, {
 
                 // Hack for now until a full component
                 this.layout.draw();
-            }
-            else if(this.updatedStage) {
+            } else if(this.updatedStage) {
                 this.layout.draw();
                 this.layout.draw3DInfo(true);
             }
@@ -235,6 +234,10 @@ exports.Stage = Montage.create(Component, {
 
             this.hideCanvas(false);
 
+            // Recalculate the canvas sizes because of splitter resizing
+            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this.element.offsetWidth - 11 ;
+            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this.element.offsetHeight - 11;
+
             this._documentRoot = this.application.ninja.currentDocument.documentRoot;
             this._viewport = this.application.ninja.currentDocument.documentRoot.parentNode;
 
@@ -319,6 +322,10 @@ exports.Stage = Montage.create(Component, {
 
     handleMousedown: {
         value: function(event) {
+            // Call the focus manager to set focus to blur any focus'd elements
+            this.focusManager.setFocus();
+
+
             var point;
 //            event.preventDefault();   // commenting because HTML elements in the IDE are retaining focus
             // If right click set the context menu to true to prevent a mouse up.
@@ -512,6 +519,36 @@ exports.Stage = Montage.create(Component, {
     },
 
     /**
+     * GetSelectableElement: Returns a selectable object (direct child of current container) at clicked point
+     *
+     * @param: X,Y
+     * @return: Returns the current container if the the X,Y hits an element in the exclusion list
+     */
+    GetSelectableElement: {
+        value: function(pos) {
+            var item = this.GetElement(pos);
+            if(this.application.ninja.currentDocument.inExclusion(item) !== -1) {
+                return this.application.ninja.currentSelectedContainer;
+            }
+            var activeContainerId = this.application.ninja.currentSelectedContainer.uuid;
+            if(item.parentNode.uuid === activeContainerId) {
+                return item;
+            } else {
+                var outerElement = item.parentNode;
+
+                while(outerElement.parentNode && outerElement.parentNode.uuid !== activeContainerId) {
+                    // If element is higher up than current container then return
+                    if(outerElement.id === "UserContent") return;
+                    // else keep going up the chain
+                    outerElement = outerElement.parentNode;
+                }
+
+                return outerElement;
+            }
+        }
+    },
+
+    /**
      * GetElement: Returns the object under the X,Y coordinates passed as an obj with x,y
      *
      * @param: X,Y