diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/stage/stage.reel/stage.js | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 515165bf..b181dc70 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -855,6 +855,12 @@ exports.Stage = Montage.create(Component, { | |||
855 | } | 855 | } |
856 | }, | 856 | }, |
857 | 857 | ||
858 | setStageAsViewport: { | ||
859 | value: function() { | ||
860 | this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.documentRoot); | ||
861 | } | ||
862 | }, | ||
863 | |||
858 | setZoom: { | 864 | setZoom: { |
859 | value: function(value) { | 865 | value: function(value) { |
860 | if(!this._firstDraw) | 866 | if(!this._firstDraw) |
@@ -958,8 +964,9 @@ exports.Stage = Montage.create(Component, { | |||
958 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; | 964 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; |
959 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; | 965 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; |
960 | } | 966 | } |
961 | }, | 967 | }, |
962 | restoreScroll:{ | 968 | |
969 | restoreScroll:{ | ||
963 | value: function(){ | 970 | value: function(){ |
964 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 971 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |
965 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 972 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |