aboutsummaryrefslogtreecommitdiff
path: root/js/document/views/design.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/document/views/design.js')
-rwxr-xr-xjs/document/views/design.js29
1 files changed, 16 insertions, 13 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..bd8c25ec 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,8 +184,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
184 this._bodyFragment = null; 184 this._bodyFragment = null;
185 //Calling standard method to finish opening document 185 //Calling standard method to finish opening document
186 this.bodyContentLoaded(null); 186 this.bodyContentLoaded(null);
187 187 //TODO: Move this to be set via the controller
188 // TODO: Clean up this code
189 this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2); 188 this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
190 this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2); 189 this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
191 } 190 }
@@ -243,17 +242,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
243 } 242 }
244 } 243 }
245 } 244 }
246 //Checking and initializing webGL 245 //Checking for script tags then parsing check for montage and webgl
247 if (scripttags.length > 0) { 246 if (scripttags.length > 0) {
247 //Checking and initializing webGL
248 this.initWebGl(scripttags); 248 this.initWebGl(scripttags);
249 } //Else there is not data to parse 249 //Checking and initializing Montage
250 250 this.initMontage(scripttags);
251 251 } else {
252 252 //Else there is not data to parse
253 //TODO: Load Montage Components (blocking) 253 }
254 //this.initMontage();
255
256
257 //Makign callback if specified 254 //Makign callback if specified
258 if (this._callback) this._callback(); 255 if (this._callback) this._callback();
259 } 256 }
@@ -350,8 +347,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
350 //////////////////////////////////////////////////////////////////// 347 ////////////////////////////////////////////////////////////////////
351 // 348 //
352 initMontage: { 349 initMontage: {
353 value: function () { 350 value: function (scripttags) {
354 //initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document) 351 //
352 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
353 //Initializing template with user's seriliazation
354 var template = this.iframe.contentWindow.mjsTemplate.create();
355 template.initWithDocument(this.iframe.contentWindow.document);
356 template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
357 }.bind(this), false);
355 } 358 }
356 }, 359 },
357 //////////////////////////////////////////////////////////////////// 360 ////////////////////////////////////////////////////////////////////