Merge branch 'master' into brushtool

2 files changed, 73 insertions, 35 deletions

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 30180155..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
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -204,8 +215,7 @@ exports.IoMediator = Montage.create(Component, {
                 template.document.content.document.head.innerHTML = template.head;
                 //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');
+                        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) {
@@ -255,6 +265,17 @@ exports.IoMediator = Montage.create(Component, {
                         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) {
+                                if (docLinks[n].attributes) {
+                                        for (var m in docLinks[n].attributes) {
+                                                        if (docLinks[n].attributes[m].name && docLinks[n].attributes[m].name.indexOf('data-ninja')!=-1) {
+                                                                docLinks[n].removeAttribute(docLinks[n].attributes[m].name);
+                                                        }
+                                                }
+                                }
+                        }
+                        //
                         for(var i in template.css) {
                                 if (template.css[i].ownerNode) {
                                         if (template.css[i].ownerNode.getAttribute) {
@@ -263,6 +284,22 @@ exports.IoMediator = Montage.create(Component, {
                                                         docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
                                                         styleCounter++;
                                                 } else {
+                                                        //Checking for attributes to be added to tag upon saving
+                                                        for (var k in docLinks) {
+                                                                if (docLinks[k].getAttribute) {
+                                                                        if (docLinks[k].getAttribute('href') && ('/'+docLinks[k].getAttribute('href')) === template.css[i].ownerNode.getAttribute('data-ninja-file-url')) {
+                                                                                for (var l in template.css[i].ownerNode.attributes) {
+                                                                                        if (template.css[i].ownerNode.attributes[l].value) {
+                                                                                                if (template.css[i].ownerNode.attributes[l].name.indexOf('data-ninja')!=-1) {
+                                                                                                        //Ninja attribute...
+                                                                                                } else {
+                                                                                                        docLinks[k].setAttribute(template.css[i].ownerNode.attributes[l].name, template.css[i].ownerNode.attributes[l].value);
+                                                                                                }
+                                                                                        }
+                                                                                }
+                                                                        }
+                                                                }
+                                                        }
                                                         //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)});
                                                 }
@@ -313,7 +350,7 @@ exports.IoMediator = Montage.create(Component, {
                         webgltag.innerHTML = json;
                 }
                 //
-                return this.getPretyHtml(template.document.content.document.documentElement.outerHTML.replace(url, ''));
+                return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.appTemplatesUrl, ''));
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -322,7 +359,7 @@ exports.IoMediator = Montage.create(Component, {
         enumerable: false,
         value: function (list) {
                 //Variable to store CSS definitions
-                var i, str, url, css = '';
+                var i, str, css = '';
                 //Looping through list
                 if (list && list.length > 0) {
                         //Adding each list item to string and also adding breaks
@@ -330,17 +367,20 @@ exports.IoMediator = Montage.create(Component, {
                                 css += list[i].cssText;
                         }
                 }
-                //TODO: Add better logic for creating this string
-                url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
                 //Returning the CSS string
-                return this.getPretyCss(css.replace(url, ''));
+                return this.getPrettyCss(css.replace(this.appTemplatesUrl, ''));
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //Using prettification code from http://jsbeautifier.org
+    ////////////////////////////////////////////////////////////////////
+    //Pretty methods (minified)
     /*
-        Copyright (c) 2009 - 2011, Einar Lielmanis
-
+                is-beautify javascript code courtesy of Einar Lielmanis:
+                Code from https://github.com/einars/js-beautify
+                License https://github.com/einars/js-beautify/blob/master/license.txt
+                Used with author's permission, as stated below
+                
+                Copyright (c) 2009 - 2011, Einar Lielmanis
                 Permission is hereby granted, free of charge, to any person
                 obtaining a copy of this software and associated documentation
                 files (the "Software"), to deal in the Software without
@@ -348,30 +388,21 @@ exports.IoMediator = Montage.create(Component, {
                 copy, modify, merge, publish, distribute, sublicense, and/or sell
                 copies of the Software, and to permit persons to whom the
                 Software is furnished to do so, subject to the following
-                conditions:
-
-                The above copyright notice and this permission notice shall be
+                conditions:The above copyright notice and this permission notice shall be
                 included in all copies or substantial portions of the Software.
-
-                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-                EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-                OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-                NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+        */
+    //For HTML, including any JS or CSS (single string/file)
+    getPrettyHtml: {