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/stage/stage.reel | |
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/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index dc6444ff..deed4112 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -387,9 +387,9 @@ exports.Stage = Montage.create(Component, { | |||
387 | handleMousewheel: { | 387 | handleMousewheel: { |
388 | value: function(event) { | 388 | value: function(event) { |
389 | if(event._event.wheelDelta > 0) { | 389 | if(event._event.wheelDelta > 0) { |
390 | this._iframeContainer.scrollTop -= 20; | 390 | this.application.ninja.currentDocument.model.views.design.document.body.scrollTop -= 20; |
391 | } else { | 391 | } else { |
392 | this._iframeContainer.scrollTop += 20; | 392 | this.application.ninja.currentDocument.model.views.design.document.body.scrollTop += 20; |
393 | } | 393 | } |
394 | } | 394 | } |
395 | }, | 395 | }, |
@@ -464,8 +464,8 @@ exports.Stage = Montage.create(Component, { | |||
464 | this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; | 464 | this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; |
465 | this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; | 465 | this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; |
466 | } else { | 466 | } else { |
467 | this._scrollLeft = this.application.ninja.currentDocument.documentRoot.scrollLeft; | 467 | this._scrollLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft; |
468 | this._scrollTop = this.application.ninja.currentDocument.documentRoot.scrollTop; | 468 | this._scrollTop = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop; |
469 | 469 | ||
470 | this.userContentLeft = -this._scrollLeft; | 470 | this.userContentLeft = -this._scrollLeft; |
471 | this.userContentTop = -this._scrollTop; | 471 | this.userContentTop = -this._scrollTop; |
@@ -512,11 +512,16 @@ exports.Stage = Montage.create(Component, { | |||
512 | */ | 512 | */ |
513 | centerStage: { | 513 | centerStage: { |
514 | value: function() { | 514 | value: function() { |
515 | this._iframeContainer.scrollLeft = this._documentOffsetLeft - (this._iframeContainer.offsetWidth - this._documentRoot.parentNode.offsetWidth)/2; | 515 | if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") { |
516 | this._iframeContainer.scrollTop = this._documentOffsetTop - (this._iframeContainer.offsetHeight - this._documentRoot.parentNode.offsetHeight)/2; | 516 | this._iframeContainer.scrollLeft = this._documentOffsetLeft - (this._iframeContainer.offsetWidth - this._documentRoot.parentNode.offsetWidth)/2; |
517 | this._iframeContainer.scrollTop = this._documentOffsetTop - (this._iframeContainer.offsetHeight - this._documentRoot.parentNode.offsetHeight)/2; | ||
517 | 518 | ||
518 | this._scrollLeft = this._iframeContainer.scrollLeft; | 519 | this._scrollLeft = this._iframeContainer.scrollLeft; |
519 | this._scrollTop = this._iframeContainer.scrollTop; | 520 | this._scrollTop = this._iframeContainer.scrollTop; |
521 | } else { | ||
522 | this._scrollLeft = this._userContentLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft = 0; | ||
523 | this._scrollTop = this._userContentTop = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop = 0; | ||
524 | } | ||
520 | } | 525 | } |
521 | }, | 526 | }, |
522 | 527 | ||