From 11ae8b91c30322074adb3cae753193d0bae3c995 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 22 Jun 2012 17:02:55 -0700
Subject: Make stage transparent when rotating/zooming templates and draw an
 outline around the user's root instead.

Also, fixed the background color setting on banner and animation templates' "body."
Stage outline draws using drawGridLines code so it can show intersection with element planes.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/mediators/template.js | 9 +++++++++
 js/document/views/design.js       | 7 +++++++
 2 files changed, 16 insertions(+)

(limited to 'js/document')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index c5b46c3a..f43b1a2c 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -158,6 +158,15 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                     ninjaContentTagDoc.removeAttribute('style');
                     ninjaContentTagDoc.removeAttribute('data-ninja-style');
                 }
+                // TODO - clean up into single method
+                ninjaContentTagMem = template.document.getElementsByTagName('ninja-viewport')[0], ninjaContentTagDoc = template.file.content.document.getElementsByTagName('ninja-viewport')[0];
+                if (ninjaContentTagMem && ninjaContentTagMem.getAttribute('data-ninja-style') !== null) {
+                    ninjaContentTagDoc.setAttribute('style', ninjaContentTagMem.getAttribute('data-ninja-style'));
+                    ninjaContentTagDoc.removeAttribute('data-ninja-style');
+                } else if (ninjaContentTagMem && ninjaContentTagMem.getAttribute('data-ninja-style') === null) {
+                    ninjaContentTagDoc.removeAttribute('style');
+                    ninjaContentTagDoc.removeAttribute('data-ninja-style');
+                }
             } else {
                 if (template.body && template.body.getAttribute('data-ninja-style') !== null) {
                     template.file.content.document.body.setAttribute('style', template.body.getAttribute('data-ninja-style'));
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 44c61617..d5c5c6c4 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -281,6 +281,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     		this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
    			//Getting style and link tags in document
             var htags = this.document.getElementsByTagName('html'),
+                bannerWrapper,
                 userStyles,
                 stags = this.document.getElementsByTagName('style'),
             	ltags = this.document.getElementsByTagName('link'), i, orgNodes,
@@ -326,6 +327,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
             //TODO: Verify appropiate location for this operation
     		if (this._template && this._template.type === 'banner') {
     			this.documentRoot = this.document.body.getElementsByTagName('ninja-content')[0];
+                bannerWrapper = this.documentRoot.parentNode;
     		} else {
     			this.documentRoot = this.document.body;
     		}
@@ -348,6 +350,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 if(userStyles = this.documentRoot.getAttribute('style')) {
                     this.documentRoot.setAttribute('data-ninja-style', userStyles);
                 }
+            }
+            if(bannerWrapper) {
+                if(userStyles = bannerWrapper.getAttribute('style')) {
+                    bannerWrapper.setAttribute('data-ninja-style', userStyles);
+                }
             }
     		//Making callback if specified
     		if (this._callback) this._callback();
-- 
cgit v1.2.3


From baa9d992a1fc3eb99b53838d898970d7b2be2c65 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 23 Jun 2012 20:21:27 -0700
Subject: Support for browser escaped file paths (CSS)

This fixes an issue with files located in folder with names/paths that the browser escapes, hence, caused a bug with the path passed to the cloud simulator and files not to be found. This does not require testing to merge.
The fix is simple, addresses folder paths with spaces and such characters in which CSS files consumed by the HTML we open in design view.
---
 js/document/helpers/url-parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/helpers/url-parser.js b/js/document/helpers/url-parser.js
index 5e71d148..7bded27d 100755
--- a/js/document/helpers/url-parser.js
+++ b/js/document/helpers/url-parser.js
@@ -53,7 +53,7 @@ exports.UrlParser = Montage.create(Component, {
         	//Getting file URI (not URL since we must load through I/O API)
 			var css = {}, file;
 			css.cssUrl =  href.split(this.application.ninja.coreIoApi.rootUrl)[1];
-			css.fileUri = this.application.ninja.coreIoApi.cloudData.root + css.cssUrl;
+			css.fileUri = this.application.ninja.coreIoApi.cloudData.root + unescape(css.cssUrl);
 			//Loading data from CSS file
 			file = this.application.ninja.coreIoApi.readFile({uri: css.fileUri});
 			//Checking for file to be writable on disk
-- 
cgit v1.2.3