aboutsummaryrefslogtreecommitdiff
path: root/js/document/views/design.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-15 15:16:05 -0700
committerJose Antonio Marquez2012-06-15 15:16:05 -0700
commitddedee035553f607a72ce34b26736cca5b8e1aae (patch)
treeea764b3cc7e925078609825b34b0570d06c5f59c /js/document/views/design.js
parentfbd9d2492aeaef392ad59792825b8757d6c363fc (diff)
parente570fc8518cf03dd03c15982edcf17c5ba0a293d (diff)
downloadninja-ddedee035553f607a72ce34b26736cca5b8e1aae.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/document/views/design.js')
-rwxr-xr-xjs/document/views/design.js21
1 files changed, 17 insertions, 4 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 1a5b071e..44c61617 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -280,7 +280,9 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
280 //Removing loading container (should be removed) 280 //Removing loading container (should be removed)
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 stags = this.document.getElementsByTagName('style'), 283 var htags = this.document.getElementsByTagName('html'),
284 userStyles,
285 stags = this.document.getElementsByTagName('style'),
284 ltags = this.document.getElementsByTagName('link'), i, orgNodes, 286 ltags = this.document.getElementsByTagName('link'), i, orgNodes,
285 scripttags = this.document.getElementsByTagName('script'); 287 scripttags = this.document.getElementsByTagName('script');
286 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles) 288 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles)
@@ -319,7 +321,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
319 //Else there is not data to parse 321 //Else there is not data to parse
320 if(this._viewCallback) { 322 if(this._viewCallback) {
321 this._viewCallback.viewCallback.call(this._viewCallback.context); 323 this._viewCallback.viewCallback.call(this._viewCallback.context);
322 } 324 }
323 } 325 }
324 //TODO: Verify appropiate location for this operation 326 //TODO: Verify appropiate location for this operation
325 if (this._template && this._template.type === 'banner') { 327 if (this._template && this._template.type === 'banner') {
@@ -335,8 +337,19 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
335 for (var n in orgNodes) { 337 for (var n in orgNodes) {
336 if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true'); 338 if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
337 } 339 }
338 340
339 //Makign callback if specified 341 // Save initial HTML and Body/ninja-content style attributes so we don't override them on save
342 if(htags.length) {
343 if(userStyles = htags[0].getAttribute('style')) {
344 htags[0].setAttribute('data-ninja-style', userStyles);
345 }
346 }
347 if(this.documentRoot) {
348 if(userStyles = this.documentRoot.getAttribute('style')) {
349 this.documentRoot.setAttribute('data-ninja-style', userStyles);
350 }
351 }
352 //Making callback if specified
340 if (this._callback) this._callback(); 353 if (this._callback) this._callback();
341 } 354 }
342 }, 355 },