aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-15 15:16:42 -0700
committerJose Antonio Marquez2012-06-15 15:16:42 -0700
commit616b31a644ee221edcbc19f821b2194e8edf9fad (patch)
tree48c76c16e73ac992298a34792062f177b81718d1 /js/document/views
parent473f5941ad518f6efe69d3924734c2cd434316db (diff)
parente570fc8518cf03dd03c15982edcf17c5ba0a293d (diff)
downloadninja-616b31a644ee221edcbc19f821b2194e8edf9fad.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/document/views')
-rwxr-xr-xjs/document/views/design.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 325259ea..44c61617 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -281,7 +281,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
281 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]); 281 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
282 //Getting style and link tags in document 282 //Getting style and link tags in document
283 var htags = this.document.getElementsByTagName('html'), 283 var htags = this.document.getElementsByTagName('html'),
284 btags = this.document.getElementsByTagName('body'),
285 userStyles, 284 userStyles,
286 stags = this.document.getElementsByTagName('style'), 285 stags = this.document.getElementsByTagName('style'),
287 ltags = this.document.getElementsByTagName('link'), i, orgNodes, 286 ltags = this.document.getElementsByTagName('link'), i, orgNodes,
@@ -339,18 +338,18 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
339 if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true'); 338 if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
340 } 339 }
341 340
342 // Save initial HTML and Body style attributes so we don't override them on save 341 // Save initial HTML and Body/ninja-content style attributes so we don't override them on save
343 if(htags.length) { 342 if(htags.length) {
344 if(userStyles = htags[0].getAttribute('style')) { 343 if(userStyles = htags[0].getAttribute('style')) {
345 htags[0].setAttribute('data-ninja-style', userStyles); 344 htags[0].setAttribute('data-ninja-style', userStyles);
346 } 345 }
347 } 346 }
348 if(btags.length) { 347 if(this.documentRoot) {
349 if(userStyles = btags[0].getAttribute('style')) { 348 if(userStyles = this.documentRoot.getAttribute('style')) {
350 btags[0].setAttribute('data-ninja-style', userStyles); 349 this.documentRoot.setAttribute('data-ninja-style', userStyles);
351 } 350 }
352 } 351 }
353 //Makign callback if specified 352 //Making callback if specified
354 if (this._callback) this._callback(); 353 if (this._callback) this._callback();
355 } 354 }
356 }, 355 },