4 files changed, 65 insertions, 34 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1f339fe7..fa611de4 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -66,35 +66,39 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     
    
     
-    handleWebRequest: {
-        value: function (request) {
-                if (request.url.indexOf('js/document/templates/montage-html') !== -1) {
                         
-                        console.log(request);
                         
-                        //TODO: Figure out why active document is not available here
                         
-                                if (this._hackRootFlag) {
-                                        
-                                        //console.log(request.url.split('/')[request.url.split('/').length-1]);
-                                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]);
                                         
+    ////////////////////////////////////////////////////////////////////
+        //
+    handleWebRequest: {
+        value: function (request) {
+                if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) {
+                        //TODO: Optimize creating string
                                         return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
                                 }
                         }
-        }
     },
-    
-
+    ////////////////////////////////////////////////////////////////////
+        //
     handleAppLoaded: {
         value: function() {
-            //
-            
-            chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
-            
+            //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
+            if (window.chrome.app.isInstalled) {
+                chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            }
         }
     },
+        ////////////////////////////////////////////////////////////////////
 
+        
+        
+        
+        
+        
+        
+        
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
@@ -118,28 +122,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //TODO: Check for appropiate structures
     handleExecuteSave: {
         value: function(event) {
+            if(!!this.activeDocument){
                 //Text and HTML document classes should return the same save object for fileSave
                 this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
                 }
+                }
     },
     ////////////////////////////////////////////////////////////////////
     //
     fileSaveResult: {
         value: function (result) {
                 if(result.status === 204){
-                this.clearDocumentDirtyFlag();
+                this.activeDocument.needsSave = false;
             }
         }
     },
-    ////////////////////////////////////////////////////////////////////
-        
-        
-    clearDocumentDirtyFlag:{
-        value: function(){
-            this.activeDocument.dirtyFlag = false;
-        }
-    },
-        
         
     createNewFile:{
         value:function(newFileObj){
@@ -278,7 +275,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.dirtyFlag === true){
+            if(this.activeDocument.needsSave === true){
                 //if file dirty then alert user to save
         }
 
@@ -301,6 +298,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 this._removeDocumentView(doc.container);
                 this.application.ninja.stage.stageView.hideRulers();
                 document.getElementById("iframeContainer").style.display="block";
+
+                this.application.ninja.stage.hideCanvas(true);
             }
         }
     },
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 65d26bdd..ac14def4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -12,6 +12,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
     addElement: {
         value: function(el, styles) {
             this.application.ninja.currentDocument.documentRoot.appendChild(el);
+            // Nested elements -
+            // TODO make sure the CSS is correct before nesting elements
+            // this.application.ninja.currentSelectedContainer.appendChild(el);
             this.application.ninja.stylesController.setElementStyles(el, styles);
         }
     },
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 833e6f04..d69b53e0 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -20,6 +20,26 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
+    /*
+     * Bound property to the ninja currentSelectedContainer
+     */
+    _selectionContainer: {
+        value: null
+    },
+
+    selectionContainer: {
+        get: function() {
+            return this._selectionContainer
+        },
+        set: function(value) {
+            if(this._selectionContainer && this._selectionContainer !== value) {
+                this.executeSelectElement();
+            }
+
+            this._selectionContainer = value;
+        }
+    },
+
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("openDocument", this, false);
@@ -53,7 +73,9 @@ exports.SelectionController = Montage.create(Component, {
                 }
             }
 
-            this.dispatchEvent(selectionEvent.event);
+            //
+            this._selectionContainer = this.application.ninja.currentSelectedContainer;
+
         }
     },
 
@@ -66,13 +88,10 @@ exports.SelectionController = Montage.create(Component, {
     handleElementDeleted: {
         value: function(event) {
             if(!this._isDocument) {
-
                 if(this.findSelectedElement(event.detail) !== -1) {
                     this.executeSelectElement();
                 }
-
             }
-
         }
     },
 
@@ -130,12 +149,17 @@ exports.SelectionController = Montage.create(Component, {
                     this.executeSelectElement();    // Else execute selection with no item
                 } else {
 
-                    if(item.parentNode.id == "UserContent") {
+//                    if(item.parentNode.id === "UserContent") {
+                    if(item.parentNode.uuid === this.selectionContainer.uuid) {
                         this.executeSelectElement(item);
                     } else {
                         var outerElement = item.parentNode;
 
-                        while(outerElement.parentNode && outerElement.parentNode.id !== "UserContent") {
+                        while(outerElement.parentNode && outerElement.parentNode.uuid !== thi