Merge branch 'refs/heads/Ninja-Internal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 44 insertions, 6 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 76436732..5d507476 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -409,6 +409,33 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             }
             
             
+            
+            
+            //Temporarily checking for disabled special case
+            var stags = this.iframe.contentWindow.document.getElementsByTagName('style'),
+                ltags = this.iframe.contentWindow.document.getElementsByTagName('link');
+                //
+            for (var m = 0; m < ltags.length; m++) {
+                if (ltags[m].getAttribute('data-ninja-template') === null) {
+                        if (ltags[m].getAttribute('disabled')) {
+                                        ltags[m].removeAttribute('disabled');
+                                        ltags[m].setAttribute('data-ninja-disabled', 'true');
+                                }
+                        }
+                }
+            //
+                for (var n = 0; n < stags.length; n++) {
+                        if (stags[n].getAttribute('data-ninja-template') === null) {
+                                if (stags[n].getAttribute('disabled')) {
+                                        stags[n].removeAttribute('disabled');
+                                        stags[n].setAttribute('data-ninja-disabled', 'true');
+                        }
+                }
+            }
+            
+            
+            
+            
             //Adding a handler for the main user document reel to finish loading
             this._document.body.addEventListener("userTemplateDidLoad",  this.userTemplateDidLoad.bind(this), false);
 
@@ -428,7 +455,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             setTimeout(function () {
                 
                 
-                
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -453,6 +479,12 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                 tag.setAttribute('data-ninja-file-url', cssUrl);
                                                                 tag.setAttribute('data-ninja-file-read-only', JSON.parse(this.application.ninja.coreIoApi.isFileWritable({uri: fileUri}).content).readOnly);
                                                                 tag.setAttribute('data-ninja-file-name', cssUrl.split('/')[cssUrl.split('/').length-1]);
+                                                                //Copying attributes to maintain same properties as the <link>
+                                                                for (var n in this._document.styleSheets[i].ownerNode.attributes) {
+                                                                        if (this._document.styleSheets[i].ownerNode.attributes[n].value && this._document.styleSheets[i].ownerNode.attributes[n].name !== 'disabled') {
+                                                                                tag.setAttribute(this._document.styleSheets[i].ownerNode.attributes[n].name, this._document.styleSheets[i].ownerNode.attributes[n].value);
+                                                                        }
+                                                                }
                                                                 tag.innerHTML = cssData.content;
                                                                 //Looping through DOM to insert style tag at location of link element
                                                                 query = this._templateDocument.html.querySelectorAll(['link']);
@@ -465,6 +497,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                         }
                                                                 }
                                                         } else {
+                                                                console.log('ERROR: Cross-Domain-Stylesheet detected, unable to load in Ninja');
                                                                 /*
 //None local stylesheet, probably on a CDN (locked)
                                                                 tag = this.iframe.contentWindow.document.createElement('style');
@@ -614,9 +647,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         enumerable: false,
         value: function () {
                 //TODO: Add logic to handle save before preview
-                this.saveAll();
+                this.application.ninja.documentController.handleExecuteSaveAll(null);
                 //Launching 'blank' tab for testing movie
-                chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});            
+                window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
+                //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});          
         }
     },
         ////////////////////////////////////////////////////////////////////
@@ -677,8 +711,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
-                this.selectionModel = this.application.ninja.selectedElements;
+                this.selectionModel = this.application.ninja.selectedElements.slice(0);
             }
+
+            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
         }
     },
 
@@ -689,8 +725,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
             this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
-            if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null) && (this.selectionModel.length > 0)){
-                this.application.ninja.selectionController.initWithDocument(this.selectionModel);
+            if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null)){
+                this.application.ninja.selectedElements = this.selectionModel.slice(0);
             }
 
             if((this.savedLeftScroll!== null) && (this.savedTopScroll !== null)){
@@ -700,6 +736,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
             }
             this.application.ninja.stage.handleScroll();
+
+            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
         }
     }
         ////////////////////////////////////////////////////////////////////