aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-01 15:27:30 -0700
committerValerio Virgillito2012-06-01 15:27:30 -0700
commit8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4 (patch)
tree72d0501e670d5a6c6d14d29645452870b0b3f0f8 /js/document/views
parentef48a58da2c7d173605fd43e8f48dac5055c3fa1 (diff)
parent4bb571a9551bba8a37bf3afd639412173d58bc71 (diff)
downloadninja-8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4.tar.gz
Merge branch 'refs/heads/master' into document-bindings-fix
Diffstat (limited to 'js/document/views')
-rwxr-xr-xjs/document/views/design.js10
1 files changed, 8 insertions, 2 deletions
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, {
124 // 124 //
125 onTemplateLoad: { 125 onTemplateLoad: {
126 value: function (e) { 126 value: function (e) {
127 //console.log(this.iframe.contentWindow); 127 //TODO: Remove, this is a temp patch for webRequest API gate
128 this.application.ninja.documentController.redirectRequests = true; 128 this.application.ninja.documentController.redirectRequests = true;
129 //TODO: Add support to constructing URL with a base HREF 129 //TODO: Add support to constructing URL with a base HREF
130 var basetag = this.content.document.getElementsByTagName('base'); 130 var basetag = this.content.document.getElementsByTagName('base');
@@ -240,7 +240,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
240 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]); 240 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
241 //Getting style and link tags in document 241 //Getting style and link tags in document
242 var stags = this.document.getElementsByTagName('style'), 242 var stags = this.document.getElementsByTagName('style'),
243 ltags = this.document.getElementsByTagName('link'), i, 243 ltags = this.document.getElementsByTagName('link'), i, orgNodes,
244 scripttags = this.document.getElementsByTagName('script'); 244 scripttags = this.document.getElementsByTagName('script');
245 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles) 245 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles)
246 this.ninjaDisableAttribute(stags); 246 this.ninjaDisableAttribute(stags);
@@ -281,6 +281,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
281 } 281 }
282 //Storing node list for reference (might need to store in the model) 282 //Storing node list for reference (might need to store in the model)
283 this._liveNodeList = this.model.documentRoot.getElementsByTagName('*'); 283 this._liveNodeList = this.model.documentRoot.getElementsByTagName('*');
284 //Getting list of original nodes
285 orgNodes = this.document.getElementsByTagName('*');
286 //TODO: Figure out if this is ideal for identifying nodes created by Ninja
287 for (var n in orgNodes) {
288 if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
289 }
284 //Initiliazing document model 290 //Initiliazing document model
285 document.application.njUtils.makeElementModel(this.model.documentRoot, "Body", "body"); 291 document.application.njUtils.makeElementModel(this.model.documentRoot, "Body", "body");
286 //Makign callback if specified 292 //Makign callback if specified