Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1

11 files changed, 90 insertions, 35 deletions

diff --git a/js/components/textfield.reel/textfield.js b/js/components/textfield.reel/textfield.js
index 5e22fcc7..e16dd786 100755
--- a/js/components/textfield.reel/textfield.js
+++ b/js/components/textfield.reel/textfield.js
@@ -27,6 +27,7 @@ exports.TextField = Montage.create(Component, {
         },
         set: function(value) {
             this._value = value;
+            this._valueSyncedWithInputField = false;
             this.needsDraw = true;
         }
     },
@@ -41,7 +42,7 @@ exports.TextField = Montage.create(Component, {
 
     handleBlur: {
         value: function(event) {
-            this._value = this.element.value;
+            this.value = this.element.value;
             this._valueSyncedWithInputField = true;
 
             var e = document.createEvent("CustomEvent");
@@ -51,27 +52,10 @@ exports.TextField = Montage.create(Component, {
             this.dispatchEvent(e);
         }
     },
-    /*
-    handleChange:
-    {
-        value:function(event)
-                {
-            this._value = this.element.value;
-            this._valueSyncedWithInputField = true;
-
-            var e = document.createEvent("CustomEvent");
-            e.initEvent("change", true, true);
-            e.type = "change";
-            e.value = this._value;
-            this.dispatchEvent(e);
-                }
-    },
-    */
 
     draw: {
         value: function() {
-            if(!this._valueSyncedWithInputField)
-            {
+            if(!this._valueSyncedWithInputField) {
                 this.element.value = this._value;
                 this._valueSyncedWithInputField = true;
             }
@@ -80,7 +64,6 @@ exports.TextField = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            //this.element.addEventListener("change", this, false);
             this.element.addEventListener("blur", this, false);
             this.element.addEventListener("keyup", this, false);
         }
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 0ca6c417..604b22d0 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -19,6 +19,14 @@ exports.BodyController = Montage.create(ElementController, {
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
 
+            if(this.application.ninja.currentDocument.model.views.design._template) {
+                if(!MathUtils.isIdentityMatrix(mat)) {
+                    el.parentNode.style.backgroundColor = "transparent";
+                } else {
+                    el.parentNode.style.removeProperty("background-color");
+                }
+            }
+
             this.application.ninja.stage.updatedStage = true;
 
             if(update3DModel) {
@@ -32,7 +40,11 @@ exports.BodyController = Montage.create(ElementController, {
             switch(p) {
                 case "background" :
                 case "background-color":
-                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color"));
+                    if(this.application.ninja.currentDocument.model.views.design._template) {
+                        return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el.parentNode, "background-color"));
+                    } else {
+                        return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color"));
+                    }
                 case "border":
                     return 0;
                 case "height":
@@ -51,7 +63,11 @@ exports.BodyController = Montage.create(ElementController, {
             switch(p) {
                 case "background":
                 case "background-color":
-                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value);
+                    if(this.application.ninja.currentDocument.model.views.design._template) {
+                        this.application.ninja.stylesController.setElementStyle(el.parentNode, "background-color", value);
+                    } else {
+                        this.application.ninja.stylesController.setElementStyle(el, "background-color", value);
+                    }
                     break;
                 case "overflow":
                 case "width":
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
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;
                 }
@@ -349,6 +351,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                     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();
         }
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index bd47ffc3..87151964 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1185,8 +1185,38 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             var context = this.application.ninja.stage.gridContext;
             var stage = this.application.ninja.stage;
             var stageRoot = this.application.ninja.currentDocument.model.documentRoot;