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

author: Jose Antonio Marquez 2012-06-15 15:16:05 -0700
committer: Jose Antonio Marquez 2012-06-15 15:16:05 -0700
commit: ddedee035553f607a72ce34b26736cca5b8e1aae (patch)
tree: ea764b3cc7e925078609825b34b0570d06c5f59c
parent: fbd9d2492aeaef392ad59792825b8757d6c363fc (diff)
parent: e570fc8518cf03dd03c15982edcf17c5ba0a293d (diff)
download: ninja-ddedee035553f607a72ce34b26736cca5b8e1aae.tar.gz
3 files changed, 52 insertions, 5 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 27989c65..0ca6c417 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -13,7 +13,8 @@ exports.BodyController = Montage.create(ElementController, {
    set3DProperties: {
        value: function(el, props, update3DModel) {
            var dist = props["dist"], mat = props["mat"];
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
+//            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
+            el.style["-webkit-transform"] = "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")";
            el.elementModel.props3D.matrix3d = mat;
            el.elementModel.props3D.perspectiveDist = dist;
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 50fad1c3..c5b46c3a 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -145,6 +145,29 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                                        template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
                                }                               
                        }
+                        //
+            if(template.template) {
+                //
+                // TODO - Need to handle banner and animation templates.
+                //Copying attributes to maintain same properties as <ninja-content>
+                var ninjaContentTagMem = template.document.getElementsByTagName('ninja-content')[0], ninjaContentTagDoc = template.file.content.document.getElementsByTagName('ninja-content')[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'));
+                    template.file.content.document.body.removeAttribute('data-ninja-style');
+                } else if (template.body && template.body.getAttribute('data-ninja-style') === null) {
+                    template.file.content.document.body.removeAttribute('style');
+                    template.file.content.document.body.removeAttribute('data-ninja-style');
+                }
+            }
                        wipeAttributes(template.file.content.document.head);
            //Copying attributes to maintain same properties as the <head>
                        for (var m in template.document.head.attributes) {
@@ -155,6 +178,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
            //Copying attributes to maintain same properties as the <html>
                        var htmlTagMem = template.document.getElementsByTagName('html')[0], htmlTagDoc = template.file.content.document.getElementsByTagName('html')[0];
                        wipeAttributes(htmlTagDoc);
+                        //
                        for (var m in htmlTagMem.attributes) {
                                if (htmlTagMem.attributes[m].value) {
                                        if (htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, '').length>0) {
@@ -162,10 +186,19 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                                        }
                                }
                        }
+                        //
+                        if (htmlTagMem && htmlTagMem.getAttribute('data-ninja-style') !== null) {
+                        htmlTagDoc.setAttribute('style', htmlTagMem.getAttribute('data-ninja-style'));
+                                htmlTagDoc.removeAttribute('data-ninja-style');
+                        } else if (htmlTagMem && htmlTagMem.getAttribute('data-ninja-style') === null) {
+                                htmlTagDoc.removeAttribute('style');
+                                htmlTagDoc.removeAttribute('data-ninja-style');
+                        }
            //Getting list of current nodes (Ninja DOM)
            presentNodes = template.file.content.document.getElementsByTagName('*');
            //Looping through nodes to determine origin and removing if not inserted by Ninja
            for (var n in presentNodes) {
+                        //
                        if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') === null) {
                                toremovetags.push(presentNodes[n]);     
                        } else if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') !== null) {
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 1a5b071e..44c61617 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -280,7 +280,9 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                //Removing loading container (should be removed)
                this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
                        //Getting style and link tags in document
-            var stags = this.document.getElementsByTagName('style'),
+            var htags = this.document.getElementsByTagName('html'),
+                userStyles,
+                stags = this.document.getElementsByTagName('style'),
                ltags = this.document.getElementsByTagName('link'), i, orgNodes,
                scripttags = this.document.getElementsByTagName('script');
                //Temporarily checking for disabled special case (we must enabled for Ninja to access styles)
@@ -319,7 +321,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                //Else there is not data to parse
                if(this._viewCallback) {
                    this._viewCallback.viewCallback.call(this._viewCallback.context);
-            }
+                }
            }
            //TODO: Verify appropiate location for this operation
                if (this._template && this._template.type === 'banner') {
@@ -335,8 +337,19 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                for (var n in orgNodes) {
                        if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
                }
-                
-                //Makign callback if specified
+            // Save initial HTML and Body/ninja-content style attributes so we don't override them on save
+            if(htags.length) {
+                if(userStyles = htags[0].getAttribute('style')) {
+                    htags[0].setAttribute('data-ninja-style', userStyles);
+                }
+            }
+            if(this.documentRoot) {
+                if(userStyles = this.documentRoot.getAttribute('style')) {
+                    this.documentRoot.setAttribute('data-ninja-style', userStyles);
+                }
+            }
+                //Making callback if specified
                if (this._callback) this._callback();
        }
    },
author	Jose Antonio Marquez	2012-06-15 15:16:05 -0700
committer	Jose Antonio Marquez	2012-06-15 15:16:05 -0700
commit	ddedee035553f607a72ce34b26736cca5b8e1aae (patch)
tree	ea764b3cc7e925078609825b34b0570d06c5f59c
parent	fbd9d2492aeaef392ad59792825b8757d6c363fc (diff)
parent	e570fc8518cf03dd03c15982edcf17c5ba0a293d (diff)
download	ninja-ddedee035553f607a72ce34b26736cca5b8e1aae.tar.gz