aboutsummaryrefslogtreecommitdiff
path: root/js/document/views/design.js
diff options
context:
space:
mode:
authorAnanya Sen2012-05-18 16:57:27 -0700
committerAnanya Sen2012-05-18 16:57:27 -0700
commitbddbcd15c165ac0731de204b023a1e60d71b5d79 (patch)
tree727997cc71d5e9c951c1089dfbdeb90cd3b68e6f /js/document/views/design.js
parent7a22f7b368ef549a5b30c58a0f3900685b764bdb (diff)
parente7c288fe8f5d3a9e5c9f0eb0a045c6c195a0e7b8 (diff)
downloadninja-bddbcd15c165ac0731de204b023a1e60d71b5d79.tar.gz
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
Diffstat (limited to 'js/document/views/design.js')
-rwxr-xr-xjs/document/views/design.js34
1 files changed, 23 insertions, 11 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3b2eb11f..3f58650e 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
64 }, 64 },
65 //////////////////////////////////////////////////////////////////// 65 ////////////////////////////////////////////////////////////////////
66 // 66 //
67 propertiesPanel: {
68 value: null
69 },
70 ////////////////////////////////////////////////////////////////////
71 //
67 initialize: { 72 initialize: {
68 value: function (parent) { 73 value: function (parent) {
69 //Creating iFrame for view 74 //Creating iFrame for view
@@ -184,6 +189,9 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
184 this._bodyFragment = null; 189 this._bodyFragment = null;
185 //Calling standard method to finish opening document 190 //Calling standard method to finish opening document
186 this.bodyContentLoaded(null); 191 this.bodyContentLoaded(null);
192 //TODO: Move this to be set via the controller
193 this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
194 this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
187 } 195 }
188 }, 196 },
189 //////////////////////////////////////////////////////////////////// 197 ////////////////////////////////////////////////////////////////////
@@ -239,17 +247,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
239 } 247 }
240 } 248 }
241 } 249 }
242 //Checking and initializing webGL 250 //Checking for script tags then parsing check for montage and webgl
243 if (scripttags.length > 0) { 251 if (scripttags.length > 0) {
252 //Checking and initializing webGL
244 this.initWebGl(scripttags); 253 this.initWebGl(scripttags);
245 } //Else there is not data to parse 254 //Checking and initializing Montage
246 255 this.initMontage(scripttags);
247 256 } else {
248 257 //Else there is not data to parse
249 //TODO: Load Montage Components (blocking) 258 }
250 //this.initMontage();
251
252
253 //Makign callback if specified 259 //Makign callback if specified
254 if (this._callback) this._callback(); 260 if (this._callback) this._callback();
255 } 261 }
@@ -346,8 +352,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
346 //////////////////////////////////////////////////////////////////// 352 ////////////////////////////////////////////////////////////////////
347 // 353 //
348 initMontage: { 354 initMontage: {
349 value: function () { 355 value: function (scripttags) {
350 //initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document) 356 //
357 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
358 //Initializing template with user's seriliazation
359 var template = this.iframe.contentWindow.mjsTemplate.create();
360 template.initWithDocument(this.iframe.contentWindow.document);
361 template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
362 }.bind(this), false);
351 } 363 }
352 }, 364 },
353 //////////////////////////////////////////////////////////////////// 365 ////////////////////////////////////////////////////////////////////