Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 81 insertions, 13 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..c4f3b361 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -199,14 +199,80 @@ exports.IoMediator = Montage.create(Component, {
     parseNinjaTemplateToHtml: {
         enumerable: false,
         value: function (template) {
-                //
+                //TODO: Clean up variables
+                //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(window.location.protocol+'//'+window.location.host+'/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('ninjauri') !== null) {
+                                        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')) {
+                                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('ninjauri') === null) {
+                                                        //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('ninjauri') === null) {
+                                                        //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('ninjauri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+                                                }
+                                        }
+                                }
+                        }
+                }
+                //
+                return template.document.content.document.documentElement.outerHTML.replace(url, '');
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -215,7 +281,7 @@ exports.IoMediator = Montage.create(Component, {
         enumerable: false,
         value: function (list) {
                 //Variable to store CSS definitions
-                var i, str, css = '';
+                var i, str, url, css = '';
                 //Looping through list
                 if (list && list.length > 0) {
                         //Adding each list item to string and also adding breaks
@@ -227,8 +293,10 @@ exports.IoMediator = Montage.create(Component, {
                                 css += '\n'+str;
                         }
                 }
+                //TODO: Add better logic for creating this string
+                url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
                 //Returning the CSS string
-                return css;
+                return css.replace(url, '');
         }
     }
     ////////////////////////////////////////////////////////////////////