Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/js/document/views/design.js b/js/document/views/design.js
index c7313708..9aeb370a 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -63,11 +63,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         set: function(value) {this._document = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
-    propertiesPanel: {
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
     //
     _liveNodeList: {
         value: null
@@ -129,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');
@@ -245,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);
@@ -286,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