aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorEric Guzman2012-04-23 22:39:22 -0700
committerEric Guzman2012-04-23 22:39:22 -0700
commit1538514aad2d249a11152789cd06f5e00386d7d7 (patch)
treec61fcc980d29d762a1ff2a3c5717b62991ed0a43 /js/stage
parent64b9c65ddee456a717bae0872a54e0593f1cd482 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-1538514aad2d249a11152789cd06f5e00386d7d7.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.js4
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;