From 3293b0b730227c14bd4f7bd53c125b48f9886764 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Tue, 5 Jun 2012 14:53:15 -0700
Subject: handle switching between multiple documents for Pen tool by having
 its own selection change handler

---
 js/stage/stage.reel/stage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/stage')

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index d8f7313b..8d1c087d 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -182,6 +182,8 @@ exports.Stage = Montage.create(Component, {
             if(this.currentDocument && (this.currentDocument.currentView === "design")) {
                 this.currentDocument.model.scrollLeft = this._scrollLeft;
                 this.currentDocument.model.scrollTop = this._scrollTop;
+                //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);
             }
 
             this._currentDocument = value;
@@ -351,7 +353,6 @@ exports.Stage = Montage.create(Component, {
             } else {
                 this.centerStage();
             }
-
             // TODO - We will need to modify this once we support switching between multiple documents
             this.application.ninja.toolsData.selectedToolInstance._configure(true);
         }
-- 
cgit v1.2.3


From 5d1fd1fc1da434cd56ac8f366eb17b692c786497 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 5 Jun 2012 16:27:46 -0700
Subject: IKNINJA-1662 - fixed js error while resizing brewing in code view

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/stage/stage.reel/stage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/stage')

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index d8f7313b..d7331e0d 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -240,7 +240,7 @@ exports.Stage = Montage.create(Component, {
 
                 // Hack for now until a full component
                 this.layout.draw();
-                if(this.currentDocument) {
+                if(this.currentDocument && (this.currentDocument.currentView === "design")) {
                     this.layout.draw3DInfo(true);
                 }
             } else if(this.updatedStage) {
-- 
cgit v1.2.3