Merge branch 'refs/heads/master' into document-bindings-fix

9 files changed, 83 insertions, 47 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 7bb07976..01e132d7 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -11,6 +11,9 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
+        
+                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+                
             if(this.application.ninja.timeline.currentLayerSelected) {
                 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
 
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
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e9ed86d7..4dbf32d5 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -277,6 +277,8 @@ exports.IoMediator = Montage.create(Component, {
                 rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
                 mjsCreator = template.mjsTemplateCreator.create(),
                 mJsSerialization,
+                toremovetags = [],
+                presentNodes,
                 montageTemplate;
             //Creating instance of template creator
             montageTemplate = mjsCreator.initWithDocument(template.document);
@@ -299,23 +301,34 @@ exports.IoMediator = Montage.create(Component, {
                                         template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
                                 }                               
                         }
-            //TODO: Add attribute copying for <HEAD> and <HTML>
             
             
-            //console.log(template.file.content.document.getElementsByTagName('html')[0].innerHTML);
+            
+            //TODO: Add attribute copying for <HEAD> and <HTML>
             
             
+            
+            //Getting list of current nodes (Ninja DOM)
+            presentNodes = template.file.content.document.getElementsByTagName('*');
+            //Looping through nodes to determine origin and removing if not inserted by Ninja
+            for (var n in presentNodes) {
+                        if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') === null) {
+                                toremovetags.push(presentNodes[n]);     
+                        } else if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') !== null) {
+                                //Removing attribute
+                                presentNodes[n].removeAttribute('data-ninja-node');
+                        }
+                }
             //Getting all CSS (style or link) tags
             var styletags = template.file.content.document.getElementsByTagName('style'),
                         linktags = template.file.content.document.getElementsByTagName('link'),
-                        toremovetags = [],
                         njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
                 
                 //////////////////////////////////////////////////
                 //TODO: Remove, temp hack, this is to be fixed by Montage
                 var basetags = template.file.content.document.getElementsByTagName('base');
                 for (var g in basetags) {
-                        if (basetags[g].getAttribute) toremovetags.push(basetags[g]);
+                        if (basetags[g].getAttribute && basetags[g].href && basetags[g].href.indexOf('chrome-extension://') !== -1) toremovetags.push(basetags[g]);
                 }
                 //////////////////////////////////////////////////
                 
@@ -392,7 +405,7 @@ exports.IoMediator = Montage.create(Component, {
                 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) {
+                            if (docLinks[n].attributes[m].name && docLinks[n].attributes[m].name.indexOf('data-ninja') !== -1) {
                                 docLinks[n].removeAttribute(docLinks[n].attributes[m].name);
                             }
                         }
@@ -404,7 +417,7 @@ exports.IoMediator = Montage.create(Component, {
                         if (template.css[i].ownerNode.getAttribute) {
                             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
-                                if (docStyles[styleCounter] && !template.css[i].ownerNode.getAttribute('data-ninja-external-url')) {
+                                if (docStyles[styleCounter] && !template.css[i].ownerNode.getAttribute('data-ninja-external-url') && template.css[i].ownerNode.getAttribute('data-ninja-node')) {
                                     docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
                                     styleCounter++;
                                 }
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index 6b2e51e2..8e9b3371 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -6,8 +6,7 @@
     <script type="text/montage-serialization">
 {
     "title": {
-        "module": "montage/ui/dynamic-text.reel",
-        "name": "DynamicText",
+        "prototype": "montage/ui/dynamic-text.reel",