2 files changed, 92 insertions, 24 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 1901079d..76436732 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -381,7 +381,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             //
             for (var k in this._document.styleSheets) {
                 if (this._document.styleSheets[k].ownerNode && this._document.styleSheets[k].ownerNode.setAttribute) {
-                        this._document.styleSheets[k].ownerNode.setAttribute('ninjatemplate', 'true');
+                        this._document.styleSheets[k].ownerNode.setAttribute('data-ninja-template', 'true');
                 }
             }
             //
@@ -449,9 +449,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                 //Creating tag with file content
                                                                 tag = this.iframe.contentWindow.document.createElement('style');
                                                                 tag.setAttribute('type', 'text/css');
-                                                                tag.setAttribute('ninjauri', fileUri);
-                                                                tag.setAttribute('ninjafileurl', cssUrl);
-                                                                tag.setAttribute('ninjafilename', cssUrl.split('/')[cssUrl.split('/').length-1]);
+                                                                tag.setAttribute('data-ninja-uri', fileUri);
+                                                                tag.setAttribute('data-ninja-file-url', cssUrl);
+                                                                tag.setAttribute('data-ninja-file-read-only', JSON.parse(this.application.ninja.coreIoApi.isFileWritable({uri: fileUri}).content).readOnly);
+                                                                tag.setAttribute('data-ninja-file-name', cssUrl.split('/')[cssUrl.split('/').length-1]);
                                                                 tag.innerHTML = cssData.content;
                                                                 //Looping through DOM to insert style tag at location of link element
                                                                 query = this._templateDocument.html.querySelectorAll(['link']);
@@ -463,6 +464,38 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                                 this._templateDocument.head.insertBefore(tag, query[j]);
                                                                         }
                                                                 }
+                                                        } else {
+                                                                /*
+//None local stylesheet, probably on a CDN (locked)
+                                                                tag = this.iframe.contentWindow.document.createElement('style');
+                                                                tag.setAttribute('type', 'text/css');
+                                                                tag.setAttribute('data-ninja-external-url', this._document.styleSheets[i].href);
+                                                                tag.setAttribute('data-ninja-file-read-only', "true");
+                                                                tag.setAttribute('data-ninja-file-name', this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1]);
+                                                                
+                                                                //TODO: Figure out cross-domain XHR issue, might need cloud to handle
+                                                                var xhr = new XMLHttpRequest();
+                                        xhr.open("GET", this._document.styleSheets[i].href, true);
+                                        xhr.send();
+                                        //
+                                        if (xhr.readyState === 4) {
+                                                console.log(xhr);
+                                        }
+                                        //tag.innerHTML = xhr.responseText //xhr.response;
+                                                                
+                                                                //Currently no external styles will load if unable to load via XHR request
+                                                                
+                                                                //Disabling external style sheets
+                                                                query = this._templateDocument.html.querySelectorAll(['link']);
+                                                                for (var j in query) {
+                                                                        if (query[j].href === this._document.styleSheets[i].href) {
+                                                                                //Disabling style sheet to reload via inserting in style tag
+                                                                                query[j].setAttribute('disabled', 'true');
+                                                                                //Inserting tag
+                                                                                this._templateDocument.head.insertBefore(tag, query[j]);
+                                                                        }
+                                                                }
+*/
                                                         }
                         }
                                         }
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e5eb1fc6..30180155 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -205,11 +205,11 @@ exports.IoMediator = Montage.create(Component, {
                 //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');
+                        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('ninjauri') !== null) {//TODO: Use querySelectorAll
+                                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]);
@@ -241,7 +241,7 @@ exports.IoMediator = Montage.create(Component, {
                                 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) {
+                                                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>
@@ -258,13 +258,13 @@ exports.IoMediator = Montage.create(Component, {
                         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) {//TODO: Use querySelectorAll
+                                                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('ninjauri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+                                                        var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: this.getCssFromRules(template.css[i].cssRules)});
                                                 }
                                         }
                                 }
@@ -297,19 +297,23 @@ exports.IoMediator = Montage.create(Component, {
                                 webgltag.setAttribute('data-ninja-webgl', 'true');
                                 template.document.content.document.head.appendChild(webgltag);
                         }
-                        //
-                        json = '\n\t\t({\n\t\t\t"version": "X.X.X.X",\n\t\t\t"data": [';
-                        //
+                        //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++) {
-                                json += '\n\t\t\t\t"'+escape(template.webgl[j])+'"';
+                                if (j === 0) {
+                                        json += '\n\t\t\t"'+escape(template.webgl[j])+'"';
+                                } else {
+                                        json += ',\n\t\t\t"'+escape(template.webgl[j])+'"';
+                                }
                         }
-                        //
-                        json += ']\n\t\t})\n\t';
-                        //
+                        //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 template.document.content.document.documentElement.outerHTML.replace(url, '');
+                return this.getPretyHtml(template.document.content.document.documentElement.outerHTML.replace(url, ''));
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -323,18 +327,49 @@ exports.IoMediator = Montage.create(Component, {
                 if (list && list.length > 0) {
                         //Adding each list item to string and also adding breaks
                         for (i = 0; list[i]; i++) {
-                                str = list[i].cssText+' ';
-                                str = str.replace( new RegExp( "{", "gi" ), "{\n\t" );
-                                str = str.replace( new RegExp( "}", "gi" ), "}\n" );
-                                str = str.replace( new RegExp( ";", "gi" ), ";\n\t" );
-                                css += '\n'+str;
+                                css += list[i].cssText;
                         }
                 }
                 //TODO: Add better logic for creating this string
-                url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
+                url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
                 //Returning the CSS string
-                return css.replace(url, '');
+                return this.getPretyCss(css.replace(url, ''));
         }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Using prettification code from http://jsbeautifier.org
+    /*
+        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
+                restriction, including without limitation the rights to use,
+                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
+                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,
+                WH