diff options
author | Eric Guzman | 2012-08-20 14:54:44 -0700 |
---|---|---|
committer | Eric Guzman | 2012-08-20 14:54:44 -0700 |
commit | 1e9d019867ff90840735ec531af5ebec9c7962e6 (patch) | |
tree | 887d28987a3113e84c771e264767c9462e9a8844 /js/document | |
parent | a34663e154af834176b758b6da368f634cd2a6bd (diff) | |
parent | 36d692a9fb216f2785a570d13c1beb27360c7305 (diff) | |
download | ninja-1e9d019867ff90840735ec531af5ebec9c7962e6.tar.gz |
Merge branch 'refs/heads/master' into minorFixes_7.1
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 |