diff options
author | Jonathan Duran | 2012-04-24 08:49:52 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-24 08:49:52 -0700 |
commit | 02414d5b25a53f7939d77c83ed550aad41e1f382 (patch) | |
tree | d918b1a78a44bddb55676d767069016db9fcda18 /js/stage/stage.reel | |
parent | 47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/components/layout/bread-crumb.reel/bread-crumb.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-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; |