diff options
author | Valerio Virgillito | 2012-08-07 15:17:46 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-07 15:17:46 -0700 |
commit | b6a8ae331cc89f494ace2571ba6719a07b0e1c64 (patch) | |
tree | e7bed03da902b8749b4cf890d682b69f567abc1d /js/document | |
parent | 7e615eaa90c7bd7a4da15ce04eb089aa3367e389 (diff) | |
parent | c00ba985a16ca0a229089243c6e04280cbff758c (diff) | |
download | ninja-b6a8ae331cc89f494ace2571ba6719a07b0e1c64.tar.gz |
Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/document-html.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index f3163339..d610c69d 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -157,6 +157,14 @@ exports.HtmlDocument = Montage.create(Component, { | |||
157 | this.model.views.design.show(); | 157 | this.model.views.design.show(); |
158 | this.model.views.design.iframe.style.opacity = 0; | 158 | this.model.views.design.iframe.style.opacity = 0; |
159 | this.model.views.design.content = this.application.ninja.ioMediator.tmplt.parseHtmlToNinjaTemplate(doc); | 159 | this.model.views.design.content = this.application.ninja.ioMediator.tmplt.parseHtmlToNinjaTemplate(doc); |
160 | // | ||
161 | if (!template) { | ||
162 | if (this.model.views.design.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) { | ||
163 | dimensions = (this.model.views.design.content.body.split('Ninja-Banner Dimensions@@@'))[1].split('-->')[0].split('x'); | ||
164 | dimensions = {width: parseInt(dimensions[0]), height: parseInt(dimensions[1])}; | ||
165 | template = {type: 'banner', size: dimensions}; | ||
166 | } | ||
167 | } | ||
160 | //TODO: Improve reference (probably through binding values) | 168 | //TODO: Improve reference (probably through binding values) |
161 | this.model.views.design._webGlHelper = this.model.webGlHelper; | 169 | this.model.views.design._webGlHelper = this.model.webGlHelper; |
162 | //Rendering design view, using observers to know when template is ready | 170 | //Rendering design view, using observers to know when template is ready |