diff options
author | Ananya Sen | 2012-04-26 12:57:56 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-26 12:57:56 -0700 |
commit | b2132103b12e499f26e6e0f311d48555a9f733ff (patch) | |
tree | 2eaa000b460e4be3c8050a369318584b2591e8d7 /js/stage/stage.reel/stage.js | |
parent | 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff) | |
parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
download | ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-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; |