aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 15:31:40 -0700
committerValerio Virgillito2012-05-04 15:31:40 -0700
commit3ebed34665fa73b0ce613b400f3029ebf4476439 (patch)
tree09a3c592035030bda7bb62d1f908ce263377d74c /js/stage/stage.reel/stage.js
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-xjs/stage/stage.reel/stage.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 2e49fc04..171c4f36 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;