diff options
author | Valerio Virgillito | 2012-06-06 14:37:04 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 14:37:04 -0700 |
commit | bc7ca741f8c8adcb5c5919af6f808a20c37ea5d7 (patch) | |
tree | 0e4cf90f47937e7d718d82da1a0d0dab5ac5f136 /js/stage | |
parent | fb684fb27c2cef04251655d86e55eceed9da3132 (diff) | |
parent | e14ce28b5c8858af75fbf2003c8f1b854daa7e35 (diff) | |
download | ninja-bc7ca741f8c8adcb5c5919af6f808a20c37ea5d7.tar.gz |
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts:
js/document/models/html.js
js/document/views/design.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 3 |
1 files changed, 2 insertions, 1 deletions
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, { | |||
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; |
@@ -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 | } |