Merge branch 'refs/heads/integration-candidate'

3 files changed, 166 insertions, 20 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 51923f08..127f73e1 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -463,7 +463,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getColor: {
         value: function(el, isFill) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getColor"](el, isFill);
         }
@@ -624,7 +624,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getColor2: {
         value: function(el, prop, mutator) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
 
             return this.getColor(el, (prop === "background"));
@@ -636,7 +636,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     get3DProperty: {
         value: function(el, prop) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["get3DProperty"](el, prop);
         }
@@ -645,7 +645,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     get3DProperties: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
 //            var mat = this.getMatrix(el);
 //            var dist = this.getPerspectiveDist(el);
@@ -658,7 +658,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getMatrix: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getMatrix"](el);
         }
@@ -667,7 +667,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getPerspectiveDist: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getPerspectiveDist"](el);
         }
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 56869839..30180155 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -195,18 +195,125 @@ exports.IoMediator = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //TODO: Expand to allow more templates
+    //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
         enumerable: false,
         value: function (template) {
-                //
+                //Injecting head and body into old document
                 template.document.content.document.body.innerHTML = template.body;
                 template.document.content.document.head.innerHTML = template.head;
-                //TODO: Remove temp fix for styles
-                if (template.style) {
-                        template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules);
+                //Getting all CSS (style or link) tags
+                var styletags = template.document.content.document.getElementsByTagName('style'),
+                        linktags = template.document.content.document.getElementsByTagName('link'),
+                        url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
+                //Looping through link tags and removing file recreated elements
+                for (var j in styletags) {
+                        if (styletags[j].getAttribute) {
+                                if(styletags[j].getAttribute('data-ninja-uri') !== null && !styletags[j].getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
+                                        try {
+                                                //Checking head first
+                                                template.document.content.document.head.removeChild(styletags[j]);
+                                        } catch (e) {
+                                                try {
+                                                        //Checking body if not in head
+                                                        template.document.content.document.body.removeChild(styletags[j]);
+                                                } catch (e) {
+                                                        //Error, not found!
+                                                }
+                                        }
+                                        
+                                }
+                        }
                 }
-                return template.document.content.document.documentElement.outerHTML;
+                //TODO: Add logic to only enble tags we disabled
+                for (var l in linktags) {
+                        if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {//TODO: Use querySelectorAll
+                                linktags[l].removeAttribute('disabled');
+                        }
+                }
+                //Checking for type of save: styles = <style> only | css = <style> and <link> (all CSS)
+                if (template.styles) {
+                        //Getting all style tags
+                        var styleCounter = 0,
+                                docStyles = template.document.content.document.getElementsByTagName('style');
+                        //Looping through all style tags
+                        for(var i in template.styles) {
+                                if (template.styles[i].ownerNode) {
+                                        if (template.styles[i].ownerNode.getAttribute) {
+                                                //Checking for node not to be loaded from file
+                                                if (template.styles[i].ownerNode.getAttribute('data-ninja-uri') === null && !template.styles[i].ownerNode.getAttribute('data-ninja-template')) {
+                                                        //Inseting data from rules array into tag as string
+                                                        docStyles[styleCounter].innerHTML = this.getCssFromRules(template.styles[i].cssRules);
+                                                        //Syncing <style> tags count since it might be mixed with <link>
+                                                        styleCounter++;
+                                                }
+                                        }
+                                }
+                        }
+                } else if (template.css) {
+                        //Getting all style and link tags
+                        var styleCounter = 0,
+                                docStyles = template.document.content.document.getElementsByTagName('style'),
+                                docLinks = template.document.content.document.getElementsByTagName('link');
+                        for(var i in template.css) {
+                                if (template.css[i].ownerNode) {
+                                        if (template.css[i].ownerNode.getAttribute) {
+                                                if (template.css[i].ownerNode.getAttribute('data-ninja-uri') === null && !template.css[i].ownerNode.getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
+                                                        //Inseting data from rules array into <style> as string
+                                                        docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
+                                                        styleCounter++;
+                                                } else {
+                                                        //Saving data from rules array converted to string into <link> file
+                                                        var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+                                                }
+                                        }
+                                }
+                        }
+                }
+                //Checking for webGL elements in document
+                if (template.webgl.length) {
+                        //
+                        var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
+                        //
+                        for (var i in scripts) {
+                                if (scripts[i].getAttribute) {
+                                        if (scripts[i].getAttribute('data-ninja-webgl') !== null) {//TODO: Use querySelectorAll
+                                                matchingtags.push(scripts[i]);
+                                        }
+                                }
+                        }
+                        //
+                        if (matchingtags.length) {
+                                if (matchingtags.length === 1) {
+                                        webgltag = matchingtags[0];
+                                } else {
+                                        //TODO: Add logic to handle multiple tags, perhaps combine to one
+                                        webgltag = matchingtags[matchingtags.length-1]; //Saving all data to last one...
+                                }
+                        }
+                        //
+                        if (!webgltag) {
+                                webgltag = template.document.content.document.createElement('script');
+                                webgltag.setAttribute('data-ninja-webgl', 'true');
+                                template.document.content.document.head.appendChild(webgltag);
+                        }
+                        //TODO: Add version and other data for RDGE
+                        json = '\n({\n\t"version": "X.X.X.X",\n\t"data": [';
+                        //Looping through data to create escaped array
+                        for (var j=0; template.webgl[j]; j++) {
+                                if (j === 0) {
+                                        json += '\n\t\t\t"'+escape(template.webgl[j])+'"';
+                                } else {
+                                        json += ',\n\t\t\t"'+escape(template.webgl[j])+'"';
+                                }
+                        }
+                        //Closing array (make-shift JSON string to validate data in <script> tag)
+                        json += '\n\t\t]\n})\n';
+                        //Setting string in tag
+                        webgltag.innerHTML = json;
+                }
+                //
+                return this.getPretyHtml(template.document.content.document.documentElement.outerHTML.replace(url, ''));
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -215,21 +322,54 @@ exports.IoMediator = Montage.create(Component, {
         enumerable: false,
         value: function (list) {
                 //Variable to store CSS definitions