diff options
author | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
commit | 6c70c8bf28c2239d29f3abecc8a7ea59b2860bab (patch) | |
tree | c506b28bc82f74072f324d920105737726d5ecaf /js/stage/stage-view.reel/stage-view.js | |
parent | 015df99dff8306f8839affd22cdd7689eb00e180 (diff) | |
parent | 24d1873302b2fffc25d254e15e8aa36f59eedb88 (diff) | |
download | ninja-6c70c8bf28c2239d29f3abecc8a7ea59b2860bab.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/stage/stage-view.reel/stage-view.js')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.js | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js index ba94fadf..757c5e51 100755 --- a/js/stage/stage-view.reel/stage-view.js +++ b/js/stage/stage-view.reel/stage-view.js | |||
@@ -112,28 +112,6 @@ exports.StageView = Montage.create(Component, { | |||
112 | */ | 112 | */ |
113 | switchDocument:{ | 113 | switchDocument:{ |
114 | value: function(doc){ | 114 | value: function(doc){ |
115 | this.application.ninja.documentController._hideCurrentDocument(); | ||
116 | this.application.ninja.documentController.activeDocument = doc; | ||
117 | |||
118 | if(this.application.ninja.documentController.activeDocument.currentView === "design") { | ||
119 | this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument; | ||
120 | } | ||
121 | |||
122 | this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe | ||
123 | |||
124 | |||
125 | // this.application.ninja.documentController._showCurrentDocument(); | ||
126 | // Inline function below | ||
127 | if(this.activeDocument) { | ||
128 | this.activeDocument.container.style["display"] = "block"; | ||
129 | if(this.activeDocument.currentView === "design"){ | ||
130 | this.activeDocument.container.parentNode.style["display"] = "block"; | ||
131 | this.activeDocument.restoreAppState(); | ||
132 | } else { | ||
133 | //hide the iframe when switching to code view | ||
134 | document.getElementById("iframeContainer").style.display = "none"; | ||
135 | } | ||
136 | } | ||
137 | 115 | ||
138 | 116 | ||
139 | //focus editor | 117 | //focus editor |