aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/document/views
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document/views')
-rwxr-xr-xjs/document/views/design.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index c7aab1d7..2ccb82d1 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,6 +184,10 @@ 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
188 // TODO: Clean up this code
189 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);
187 } 191 }
188 }, 192 },
189 //////////////////////////////////////////////////////////////////// 193 ////////////////////////////////////////////////////////////////////
@@ -347,7 +351,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
347 // 351 //
348 initMontage: { 352 initMontage: {
349 value: function () { 353 value: function () {
350 // 354 //initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document)
351 } 355 }
352 }, 356 },
353 //////////////////////////////////////////////////////////////////// 357 ////////////////////////////////////////////////////////////////////