From 604ace9cfc9fae6b6c121259523a9060c5306161 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 27 Feb 2012 11:59:58 -0800
Subject: - save show3DGrid flag per document while switching documents - fix
 zoom tool keyboard control to listen to Z when ctrl and shift keys are not
 pressed with it

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/html-document.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 8798b407..c36e61d5 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -623,6 +623,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
                 this.selectionModel = this.application.ninja.selectedElements;
             }
+
+            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
         }
     },
 
@@ -644,6 +646,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;
         }
     }
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 2ce9f65c3a34937928f08690606962af3085c74f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 28 Feb 2012 15:03:23 -0800
Subject: CSS attributes

Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save.
---
 js/document/html-document.js | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 75628731..6853f4d7 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');
-- 
cgit v1.2.3


From 5ab7efb9949e486395659c383064a08821febdae Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 28 Feb 2012 15:15:27 -0800
Subject: persist selections while switching documents

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/html-document.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 75628731..0e74914a 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -677,7 +677,7 @@ 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;
@@ -691,8 +691,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)){
-- 
cgit v1.2.3


From bb3e42b531848b400670df6caf0f3ce02adf1243 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 29 Feb 2012 11:28:58 -0800
Subject: Fix: Caching issue with chrome tab API

Using window.open to test movie.
---
 js/document/html-document.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 6853f4d7..60eecc59 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -649,7 +649,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     		//TODO: Add logic to handle save before preview
     		this.saveAll();
     		//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]});		
     	}
     },
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 03d277db80b6cea9a25320c0575ae2bf7a6d7e6e Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 29 Feb 2012 11:46:44 -0800
Subject: Preview Fix

Adding save all logic before preview, temporary fix.
---
 js/document/html-document.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 60eecc59..579603e0 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -647,7 +647,7 @@ 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
     		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]});		
-- 
cgit v1.2.3