aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-11 15:15:33 -0700
committerJose Antonio Marquez2012-05-11 15:15:33 -0700
commitd114f222cb48a101ffdb1b88d43823ca16f2c7df (patch)
treef6aa6548db45bb0d09fc4e01909028d03015e0ec /js/document
parentd2e1d4eeba4439ed26f2adf1c34991caf44a591f (diff)
downloadninja-d114f222cb48a101ffdb1b88d43823ca16f2c7df.tar.gz
Fixing overflow bug for banner templates
Ensuring overflow is visible but saved as hidden.
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/document-html.js1
-rwxr-xr-xjs/document/views/design.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 7e1f1806..4767271f 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -100,7 +100,6 @@ exports.HtmlDocument = Montage.create(Component, {
100 this._document = this.model.views.design.document; 100 this._document = this.model.views.design.document;
101 //TODO: Remove usage, seems as not needed 101 //TODO: Remove usage, seems as not needed
102 if (template && template.type === 'banner') { 102 if (template && template.type === 'banner') {
103 //this.documentRoot = this.model.views.design.document.body;
104 this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-banner')[0]; 103 this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-banner')[0];
105 } else { 104 } else {
106 this.documentRoot = this.model.views.design.document.body; 105 this.documentRoot = this.model.views.design.document.body;
diff --git a/js/document/views/design.js b/js/document/views/design.js
index e838dd49..16d1ac06 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -168,7 +168,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
168 } 168 }
169 } 169 }
170 //Adjusting margin per size of document 170 //Adjusting margin per size of document
171 this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}'; 171 this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important; margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
172 //Setting content in template 172 //Setting content in template
173 ninjaBanner.innerHTML = banner.innerHTML; 173 ninjaBanner.innerHTML = banner.innerHTML;
174 //Garbage collection 174 //Garbage collection