Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

2 files changed, 24 insertions, 0 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 28484b71..99c3a403 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -46,6 +46,9 @@ exports.Layout = Montage.create(Component, {
                 return;
             }
 
+            drawUtils._eltArray.length = 0;
+            drawUtils._planesArray.length = 0;
+
             this._currentDocument = value;
 
             if(!value) {
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index f4de3070..5e913c76 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -249,6 +249,10 @@ exports.Stage = Montage.create(Component, {
                 this.currentDocument.model.documentOffsetTop = this._documentOffsetTop;
                 this.currentDocument.model.userContentLeft = this._userContentLeft;
                 this.currentDocument.model.userContentTop = this._userContentTop;
+                this.currentDocument.model.templateLeft = this.templateLeft;
+                this.currentDocument.model.templateTop = this.templateTop;
+                this.currentDocument.model.minLeftElement = this.minLeftElement;
+                this.currentDocument.model.minTopElement = this.minTopElement;
 
                 //call configure false with the old document on the selected tool to tear down down any temp. stuff
                 this.application.ninja.toolsData.selectedToolInstance._configure(false);
@@ -279,6 +283,13 @@ exports.Stage = Montage.create(Component, {
     _userPaddingLeft: { value: 0 },
     _userPaddingTop: { value: 0 },
 
+    templateLeft: { value: 0 },
+    templateTop: { value: 0 },
+
+    // keep track of the elements that determine the minimum left and top scrollable amount
+    minLeftElement: { value: null },
+    minTopElement: { value: null },
+
     userPaddingLeft: {
         get: function() { return this._userPaddingLeft; },
         set: function(value) {
@@ -374,6 +385,10 @@ exports.Stage = Montage.create(Component, {
                 this._userContentTop = this.currentDocument.model.userContentTop;
                 this._scrollLeft = this.currentDocument.model.scrollLeft;
                 this._scrollTop = this.currentDocument.model.scrollTop;
+                this.templateLeft = this.currentDocument.model.templateLeft;
+                this.templateTop = this.currentDocument.model.templateTop;
+                this.minLeftElement = this.currentDocument.model.minLeftElement;
+                this.minTopElement = this.currentDocument.model.minTopElement;
             } else {
                 this._userPaddingLeft = 0;
                 this._userPaddingTop = 0;
@@ -383,6 +398,10 @@ exports.Stage = Montage.create(Component, {
                 this._userContentTop = 0;
                 this._scrollLeft = 0;
                 this._scrollTop = 0;
+                this.templateLeft = 0;
+                this.templateTop = 0;
+                this.minLeftElement = null;
+                this.minTopElement = null;
             }
 
             // Recalculate the canvas sizes because of splitter resizing
@@ -400,9 +419,11 @@ exports.Stage = Montage.create(Component, {
                 var initialTop = parseInt((this.canvas.height - designView._template.size.height)/2);
                 if(initialLeft > this.documentOffsetLeft) {
                     this.userPaddingLeft = -initialLeft;
+                    this.templateLeft = -initialLeft;
                 }
                 if(initialTop > this.documentOffsetTop) {
                     this.userPaddingTop = -initialTop;
+                    this.templateTop = -initialTop;
                 }
             }