aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:04:29 -0700
committerArmen Kesablyan2012-06-11 11:04:29 -0700
commit0f040acabfb7a4bf3138debec5aff869487ceb11 (patch)
tree53eaa8ba54cf23a1c3ea0c8b39377773198c3e19 /js/stage
parent7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a (diff)
parent756cbfad2b98b300af8db3793aa21718b88dd950 (diff)
downloadninja-0f040acabfb7a4bf3138debec5aff869487ceb11.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index d8f7313b..30ee1e40 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -182,6 +182,8 @@ exports.Stage = Montage.create(Component, {
182 if(this.currentDocument && (this.currentDocument.currentView === "design")) { 182 if(this.currentDocument && (this.currentDocument.currentView === "design")) {
183 this.currentDocument.model.scrollLeft = this._scrollLeft; 183 this.currentDocument.model.scrollLeft = this._scrollLeft;
184 this.currentDocument.model.scrollTop = this._scrollTop; 184 this.currentDocument.model.scrollTop = this._scrollTop;
185 //call configure false with the old document on the selected tool to tear down down any temp. stuff
186 this.application.ninja.toolsData.selectedToolInstance._configure(false);
185 } 187 }
186 188
187 this._currentDocument = value; 189 this._currentDocument = value;
@@ -240,7 +242,7 @@ exports.Stage = Montage.create(Component, {
240 242
241 // Hack for now until a full component 243 // Hack for now until a full component
242 this.layout.draw(); 244 this.layout.draw();
243 if(this.currentDocument) { 245 if(this.currentDocument && (this.currentDocument.currentView === "design")) {
244 this.layout.draw3DInfo(true); 246 this.layout.draw3DInfo(true);
245 } 247 }
246 } else if(this.updatedStage) { 248 } else if(this.updatedStage) {
@@ -351,7 +353,6 @@ exports.Stage = Montage.create(Component, {
351 } else { 353 } else {
352 this.centerStage(); 354 this.centerStage();
353 } 355 }
354
355 // TODO - We will need to modify this once we support switching between multiple documents 356 // TODO - We will need to modify this once we support switching between multiple documents
356 this.application.ninja.toolsData.selectedToolInstance._configure(true); 357 this.application.ninja.toolsData.selectedToolInstance._configure(true);
357 } 358 }