diff options
author | Valerio Virgillito | 2012-04-23 17:09:31 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-23 17:09:31 -0700 |
commit | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (patch) | |
tree | 3f383cb4b9e92dcb7f80eed62ff6cbc467062448 /js/stage | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
parent | 4ab2a55ba2175c72f859c428122a166f8af74140 (diff) | |
download | ninja-55e6d621b9555abac06ab4adff44dfe29a78ec4e.tar.gz |
Merge pull request #173 from mencio/stage-document-architecture
Stage document architecture - Initial commit to support opening Web template
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index ec8c0e55..8382135d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -252,7 +252,9 @@ exports.Stage = Montage.create(Component, { | |||
252 | this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft; | 252 | this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft; |
253 | this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop; | 253 | this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop; |
254 | 254 | ||
255 | this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border")); | 255 | // Hardcode this value so that it does not fail for the new stage architecture |
256 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | ||
257 | this.userContentBorder = 1; //parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border")); | ||
256 | 258 | ||
257 | this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; | 259 | this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; |
258 | this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; | 260 | this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; |