diff options
author | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
commit | b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28 (patch) | |
tree | 8a25f983cf5fc9eb8aab34a11fe8c90e8604bed3 /js/stage/stage-view.reel | |
parent | 4bdb951f2dab6d132ed28ab17888cc819ed811ee (diff) | |
parent | 50e5491f44e577c66dfefb5d22815ef20ea5c1b1 (diff) | |
download | ninja-b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28.tar.gz |
Merge pull request #30 from ananyasen/FileIO-ananya
FileIO branch pull request
Diffstat (limited to 'js/stage/stage-view.reel')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js index 91047e51..ad67cada 100755 --- a/js/stage/stage-view.reel/stage-view.js +++ b/js/stage/stage-view.reel/stage-view.js | |||
@@ -125,6 +125,10 @@ exports.StageView = Montage.create(Component, { | |||
125 | 125 | ||
126 | this.application.ninja.documentController.activeDocument = doc; | 126 | this.application.ninja.documentController.activeDocument = doc; |
127 | 127 | ||
128 | if(this.application.ninja.documentController.activeDocument.currentView === "design") { | ||
129 | this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument; | ||
130 | } | ||
131 | |||
128 | this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe | 132 | this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe |
129 | this.application.ninja.documentController._showCurrentDocument(); | 133 | this.application.ninja.documentController._showCurrentDocument(); |
130 | 134 | ||
@@ -135,7 +139,6 @@ exports.StageView = Montage.create(Component, { | |||
135 | 139 | ||
136 | if(this.application.ninja.documentController.activeDocument.currentView === "design") { | 140 | if(this.application.ninja.documentController.activeDocument.currentView === "design") { |
137 | this.application.ninja.stage._scrollFlag = true; // TODO HACK to prevent type error on Hide/Show Iframe | 141 | this.application.ninja.stage._scrollFlag = true; // TODO HACK to prevent type error on Hide/Show Iframe |
138 | this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument; | ||
139 | 142 | ||
140 | //reinitialize draw-util, snapmanager and view-util | 143 | //reinitialize draw-util, snapmanager and view-util |
141 | this.application.ninja.stage.stageDeps.reinitializeForSwitchDocument(); | 144 | this.application.ninja.stage.stageDeps.reinitializeForSwitchDocument(); |