aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-29 15:42:24 -0700
committerNivesh Rajbhandari2012-05-29 15:42:24 -0700
commit820005437e7270e72b865a3436d7148e1dd19900 (patch)
tree10304bc71f4023b4363dd8bc20e087314e59ff5c /js
parent961830a1ab076db70577df735f43cae5e8559e83 (diff)
downloadninja-820005437e7270e72b865a3436d7148e1dd19900.tar.gz
Fixed bug with scrolling too much when moving objects in negative space.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js4
-rwxr-xr-xjs/stage/stage.reel/stage.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 9e9a2241..c98ad8bc 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -276,8 +276,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
276 stage = this.application.ninja.stage, 276 stage = this.application.ninja.stage,
277 minLeft = stage.userPaddingLeft, 277 minLeft = stage.userPaddingLeft,
278 minTop = stage.userPaddingTop, 278 minTop = stage.userPaddingTop,
279 docLeft = stage.documentOffsetLeft, 279 docLeft = stage.userContentLeft,
280 docTop = stage.documentOffsetTop, 280 docTop = stage.userContentTop,
281 l, 281 l,
282 t, 282 t,
283 plane, 283 plane,
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 44d6eadb..7025c692 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -193,7 +193,7 @@ exports.Stage = Montage.create(Component, {
193 this._userPaddingLeft = value; 193 this._userPaddingLeft = value;
194 this._documentOffsetLeft = -value; 194 this._documentOffsetLeft = -value;
195 this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px"; 195 this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
196 this.userContentLeft = this._documentOffsetLeft; 196 this.userContentLeft = this._documentOffsetLeft - this._scrollLeft;
197 this.updatedStage = true; 197 this.updatedStage = true;
198 } 198 }
199 }, 199 },
@@ -204,7 +204,7 @@ exports.Stage = Montage.create(Component, {
204 this._userPaddingTop = value; 204 this._userPaddingTop = value;
205 this._documentOffsetTop = -value; 205 this._documentOffsetTop = -value;
206 this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px"; 206 this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";
207 this.userContentTop = this._documentOffsetTop; 207 this.userContentTop = this._documentOffsetTop - this._scrollTop;
208 this.updatedStage = true; 208 this.updatedStage = true;
209 } 209 }
210 }, 210 },