3 files changed, 19 insertions, 3 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8cc61026..33a41a8e 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -62,6 +62,8 @@ exports.HtmlDocument = Montage.create(Component, {
                 parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
                 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
+            //Calling the any init routines in the model
+            this.model.init();
             //Initiliazing views and hiding
                 if (this.model.views.design.initialize(this.model.parentContainer)) {
                         //Hiding iFrame, just initiliazing
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 9f5599a2..9aa0d27e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,6 +18,14 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
+        //Called by the document immidiately after the model is created
+    init: {
+        value:function() {
+                //Creating instance of the webGL helper for this model
+                this.webGlHelper = webGlDocumentHelper.create();
+                }           
+    },
+    ////////////////////////////////////////////////////////////////////
     //
     selectionContainer: {
         value: []
@@ -52,7 +60,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     ////////////////////////////////////////////////////////////////////
         //
         webGlHelper: {
-        value: webGlDocumentHelper
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/document/views/design.js b/js/document/views/design.js
index dd8754ed..9aeb370a 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -124,7 +124,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         //
     onTemplateLoad: {
         value: function (e) {
-                //console.log(this.iframe.contentWindow);
+                //TODO: Remove, this is a temp patch for webRequest API gate
                 this.application.ninja.documentController.redirectRequests = true;
                 //TODO: Add support to constructing URL with a base HREF
                 var basetag = this.content.document.getElementsByTagName('base');
@@ -240,7 +240,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
                         //Getting style and link tags in document
             var stags = this.document.getElementsByTagName('style'),
-                ltags = this.document.getElementsByTagName('link'), i,
+                ltags = this.document.getElementsByTagName('link'), i, orgNodes,
                 scripttags = this.document.getElementsByTagName('script');
                 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles)
                 this.ninjaDisableAttribute(stags);
@@ -281,6 +281,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 }
                 //Storing node list for reference (might need to store in the model)
                 this._liveNodeList = this.model.documentRoot.getElementsByTagName('*');
+                //Getting list of original nodes
+                orgNodes = this.document.getElementsByTagName('*');
+                //TODO: Figure out if this is ideal for identifying nodes created by Ninja
+                for (var n in orgNodes) {
+                        if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
+                }
                 //Initiliazing document model
                 document.application.njUtils.makeElementModel(this.model.documentRoot, "Body", "body");
                 //Makign callback if specified