Merge branch 'refs/heads/integration'

1 files changed, 22 insertions, 10 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 6d9a7355..59eb9317 100644..100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -4,15 +4,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
-var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
+var Montage =   require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
+    vecUtils =  require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.Stage = Montage.create(Component, {
 
-    textTool: { value: null },
     // TODO - Need to figure out how to remove this dependency
     // Needed by some tools that depend on selectionDrawn event to set up some logic
     drawNow: { value : false },
@@ -117,9 +115,6 @@ exports.Stage = Montage.create(Component, {
     _userContentLeft:       { value: 0 },
     _userContentTop:        { value: 0 },
     _userContentBorder:     { value: 0 },
-    savedLeftScroll:        { value: null },
-    savedTopScroll:         { value: null },
-
 
     documentRoot: {
         get: function () { return this._documentRoot; },
@@ -248,6 +243,8 @@ exports.Stage = Montage.create(Component, {
 
             this._scrollLeft = this._iframeContainer.scrollLeft;
             this._scrollTop = this._iframeContainer.scrollTop;
+            this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
+            this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop;
 
             this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
 
@@ -883,5 +880,20 @@ exports.Stage = Montage.create(Component, {
 
             this.stageDeps.snapManager.updateWorkingPlaneFromView();
         }
-    }
+    },
+
+    saveScroll:{
+       value: function(){
+           this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
+           this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;
+       }
+   },
+   restoreScroll:{
+       value: function(){
+           this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
+           this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
+           this._iframeContainer.scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
+           this._scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
+       }
+   }
 });
\ No newline at end of file