diff options
author | Valerio Virgillito | 2012-05-16 00:54:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 00:54:40 -0700 |
commit | a9672abd32c2e03b8607c1af4903c90f7ff9531c (patch) | |
tree | 30da60ed624d3d60b09fc04672c502bbed3b11f8 /js/tools | |
parent | 6dfe2e62b1d7a71daf097aac3a31213d564e6122 (diff) | |
parent | 2b21e91a3343229bb87179e08be1e532fcf9b8f9 (diff) | |
download | ninja-a9672abd32c2e03b8607c1af4903c90f7ff9531c.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/PanTool.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js index 132ac0b1..5cfeec75 100755 --- a/js/tools/PanTool.js +++ b/js/tools/PanTool.js | |||
@@ -148,8 +148,7 @@ exports.PanTool = Montage.create(toolBase, | |||
148 | delta = 10*event.wheelDelta/120; | 148 | delta = 10*event.wheelDelta/120; |
149 | //console.log( "delta: " + delta ); | 149 | //console.log( "delta: " + delta ); |
150 | 150 | ||
151 | this.application.ninja.currentDocument.documentRoot.scrollLeft += delta; | 151 | this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta; |
152 | // this.application.ninja.stage._scrollLeft += delta; | ||
153 | 152 | ||
154 | delta *= zoom; | 153 | delta *= zoom; |
155 | 154 | ||
@@ -330,8 +329,8 @@ exports.PanTool = Montage.create(toolBase, | |||
330 | var limitX = false; | 329 | var limitX = false; |
331 | var limitY = false; | 330 | var limitY = false; |
332 | 331 | ||
333 | var oldLeft = this.application.ninja.currentDocument.documentRoot.scrollLeft, | 332 | var oldLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft, |
334 | oldTop = this.application.ninja.currentDocument.documentRoot.scrollTop, | 333 | oldTop = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop, |
335 | newLeft = oldLeft - deltaGPt[0], | 334 | newLeft = oldLeft - deltaGPt[0], |
336 | newTop = oldTop - deltaGPt[1]; | 335 | newTop = oldTop - deltaGPt[1]; |
337 | if((newLeft < 0) || (newLeft > this._maxHorizontalScroll)) | 336 | if((newLeft < 0) || (newLeft > this._maxHorizontalScroll)) |
@@ -342,10 +341,10 @@ exports.PanTool = Montage.create(toolBase, | |||
342 | { | 341 | { |
343 | limitY = true; | 342 | limitY = true; |
344 | } | 343 | } |
345 | this.application.ninja.currentDocument.documentRoot.scrollLeft -= deltaGPt[0]; | 344 | this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft -= deltaGPt[0]; |
346 | this.application.ninja.currentDocument.documentRoot.scrollTop -= deltaGPt[1]; | 345 | this.application.ninja.currentDocument.model.views.design.document.body.scrollTop -= deltaGPt[1]; |
347 | deltaGPt[0] = oldLeft - this.application.ninja.currentDocument.documentRoot.scrollLeft; | 346 | deltaGPt[0] = oldLeft - this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft; |
348 | deltaGPt[1] = oldTop - this.application.ninja.currentDocument.documentRoot.scrollTop; | 347 | deltaGPt[1] = oldTop - this.application.ninja.currentDocument.model.views.design.document.body.scrollTop; |
349 | 348 | ||
350 | gPt[0] -= deltaGPt[0]; | 349 | gPt[0] -= deltaGPt[0]; |
351 | gPt[1] -= deltaGPt[1]; | 350 | gPt[1] -= deltaGPt[1]; |