diff options
author | Ananya Sen | 2012-06-07 11:59:32 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-07 11:59:32 -0700 |
commit | 7378b6846f140106490f10c02cd7cec6a19023aa (patch) | |
tree | 90b60c007696b4a73c29abbae82562f69f15c11a /js/stage/stage.reel/stage.js | |
parent | aea0e6879abfef02a827ed239ef091c3b96d6eb2 (diff) | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
download | ninja-7378b6846f140106490f10c02cd7cec6a19023aa.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 5 |
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 | } |