diff options
| author | Jose Antonio Marquez | 2012-04-24 10:06:53 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-24 10:06:53 -0700 |
| commit | 4c15e77bdb7f4e0558f3749994a8a37b207b97ae (patch) | |
| tree | 593ab4917fb5cc3ef8ee36822b56c6edd30c33a5 /js/stage | |
| parent | 36d50b6599ab98559c76e1fe57b1bb131c4433da (diff) | |
| parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
| download | ninja-4c15e77bdb7f4e0558f3749994a8a37b207b97ae.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
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; |