3 files changed, 217 insertions, 26 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..e763c67c 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -39,6 +39,12 @@ exports.IoMediator = Montage.create(Component, {
         enumerable: false,
         value: ProjectIo
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    appTemplatesUrl: {
+        enumerable: false,
+        value: new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi')
+    },
         ////////////////////////////////////////////////////////////////////
     //
     fileNew: {
@@ -146,22 +152,27 @@ exports.IoMediator = Montage.create(Component, {
                                 //Copy webGL library if needed
                                 if (file.webgl.length > 0) {
                                         for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
-                                                //if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Assets' || this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
+                                                //Checking for RDGE library to be available
                                                 if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
                                                         this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(file.document.root, (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase());
+                                                } else {
+                                                        //TODO: Error handle no available library to copy
                                                 }
                                         }
                                 }
-                                //
+                                
+                                //TODO: Add check for Monatage library to copy
+                                
+                                //Getting content from function to properly handle saving assets (as in external if flagged)
                                 contents = this.parseNinjaTemplateToHtml(file);
                                 break;
                         default:
                                 contents = file.content;
                                 break;
                 }
-                //
+                //Making call to save file
                 save = this.fio.saveFile({uri: file.document.uri, contents: contents});
-            //
+            //Checking for callback
             if (callback) callback(save);
         }
     },
@@ -170,7 +181,7 @@ exports.IoMediator = Montage.create(Component, {
     fileSaveAs: {
         enumerable: false,
         value: function (copyTo, copyFrom, callback) {
-                //
+                //TODO: Implement Save As functionality
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -178,7 +189,7 @@ exports.IoMediator = Montage.create(Component, {
     fileDelete: {
         enumerable: false,
         value: function (file, callback) {
-                //
+                //TODO: Implement Delete functionality
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -195,18 +206,151 @@ 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');
+                //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!
+                                                }
+                                        }
+                                        
+                                }
+                        }
+                }
+                //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');
+                        //Removing Ninja Data Attributes
+                        for (var n in docLinks) {