3 files changed, 207 insertions, 20 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index f5816f64..76436732 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -23,6 +23,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 
     _document: { value: null, enumerable: false },
     _documentRoot: { value: null, enumerable: false },
+    _liveNodeList: { value: null, enumarable: false },
     _stageBG: { value: null, enumerable: false },
     _window: { value: null, enumerable: false },
     _styles: { value: null, enumerable: false },
@@ -53,6 +54,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     },
 
 
+    //drawUtils state
+    _gridHorizontalSpacing: {value:0},
+    _gridVerticalSpacing: {value:0},
+    //end - drawUtils state
+
 
     // GETTERS / SETTERS
 
@@ -71,6 +77,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         set: function(value) { this._savedTopScroll = value}
     },
 
+    gridHorizontalSpacing:{
+        get: function() { return this._gridHorizontalSpacing; },
+        set: function(value) { this._gridHorizontalSpacing = value}
+    },
+
+    gridVerticalSpacing:{
+        get: function() { return this._gridVerticalSpacing; },
+        set: function(value) { this._gridVerticalSpacing = value}
+    },
+
     selectionExclude: {
         get: function() { return this._selectionExclude; },
         set: function(value) { this._selectionExclude = value; }
@@ -161,15 +177,15 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 cdm.collectGLData( elt,  this._glData );
                         }
                                 
-                        return this._glData
+                        return this._glData;
                 },
 
         set: function(value)
                 {
-                        var elt = this.iframe.contentWindow.document.getElementById("UserContent");
+                        var elt = this.documentRoot;
                         if (elt)
                         {
-                                console.log( "load canvas data: " + value );
+                                console.log( "load canvas data: " , value );
                                 var cdm = new CanvasDataManager();
                                 cdm.loadGLData(elt,  value);
                         }
@@ -352,29 +368,63 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         value: function(event){
                 //TODO: Clean up, using for prototyping save
                 this._templateDocument = {};
+                this._templateDocument.html = this.iframe.contentWindow.document;
                 this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");
                 this._templateDocument.body = this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
                 //TODO: Remove, also for prototyping
                 this.application.ninja.documentController._hackRootFlag = true;
                 //
-            //this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
             this.stageBG = this.iframe.contentWindow.document.getElementById("stageBG");
             this.stageBG.onclick = null;
             this._document = this.iframe.contentWindow.document;
             this._window = this.iframe.contentWindow;
             //
-            if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
+            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('data-ninja-template', 'true');
+                }
+            }
             //
+            if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
+            //Inserting user's document into template
             this._templateDocument.head.innerHTML = this._userDocument.content.head;
             this._templateDocument.body.innerHTML = this._userDocument.content.body;
-
-            // Adding a handler for the main user document reel to finish loading.
+            //TODO: Use querySelectorAll
+            var scripttags = this._templateDocument.html.getElementsByTagName('script'), webgldata;
+            //
+            for (var w in scripttags) {
+                if (scripttags[w].getAttribute) {
+                        if (scripttags[w].getAttribute('data-ninja-webgl') !== null) {
+                                //TODO: Add logic to handle more than one data tag
+                                webgldata = JSON.parse((scripttags[w].innerHTML.replace("(", "")).replace(")", ""));
+                        }
+                }
+            }
+            //
+            if (webgldata) {
+                for (var n=0; webgldata.data[n]; n++) {
+                        webgldata.data[n] = unescape(webgldata.data[n]);
+                }
+                this._templateDocument.webgl = webgldata.data;
+            }
+            
+            
+            //Adding a handler for the main user document reel to finish loading
             this._document.body.addEventListener("userTemplateDidLoad",  this.userTemplateDidLoad.bind(this), false);
 
-            
+            // Live node list of the current loaded document
+            this._liveNodeList = this.documentRoot.getElementsByTagName('*');
+
+            // TODO Move this to the appropriate location
+            var len = this._liveNodeList.length;
+
+            for(var i = 0; i < len; i++) {
+                NJUtils.makeModelFromElement(this._liveNodeList[i]);
+            }
+
             /* this.iframe.contentWindow.document.addEventListener('DOMSubtreeModified', function (e) { */ //TODO: Remove events upon loading once
 
-            //TODO: When written, the best way to initialize the document is to listen for the DOM tree being modified
+            //TODO: When re-written, the best way to initialize the document is to listen for the DOM tree being modified
             setTimeout(function () {
                 
                 
@@ -383,8 +433,80 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 if(this._document.styleSheets.length > 1) {
-                                        this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
-                                        this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
+                                        //Checking all styleSheets in document
+                                        for (var i in this._document.styleSheets) {
+                                                //If rules are null, assuming cross-origin issue
+                                                if(this._document.styleSheets[i].rules === null) {
+                                                        //TODO: Revisit URLs and URI creation logic, very hack right now
+                                                        var fileUri, cssUrl, cssData, tag, query;
+                                                        if (this._document.styleSheets[i].href.indexOf('js/document/templates/montage-html') !== -1) {
+                                                                //Getting the url of the CSS file
+                                                                cssUrl = this._document.styleSheets[i].href.split('js/document/templates/montage-html')[1];
+                                                                //Creating the URI of the file (this is wrong should not be splitting cssUrl)
+                                                                fileUri = this.application.ninja.coreIoApi.cloudData.root+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+cssUrl.split('/')[1];
+                                                                //Loading the data from the file
+                                                                cssData = this.application.ninja.coreIoApi.readFile({uri: fileUri});
+                                                                //Creating tag with file content
+                                                                tag = this.iframe.contentWindow.document.createElement('style');
+                                                                tag.setAttribute('type', 'text/css');
+                                                                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']);
+                                                                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]);
+                                                                        }
+                                                                }
+                                                        } 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
+                                                                
+