diff options
author | Ananya Sen | 2012-05-18 16:57:27 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-18 16:57:27 -0700 |
commit | bddbcd15c165ac0731de204b023a1e60d71b5d79 (patch) | |
tree | 727997cc71d5e9c951c1089dfbdeb90cd3b68e6f /js/stage/stage-view.reel/stage-view.js | |
parent | 7a22f7b368ef549a5b30c58a0f3900685b764bdb (diff) | |
parent | e7c288fe8f5d3a9e5c9f0eb0a045c6c195a0e7b8 (diff) | |
download | ninja-bddbcd15c165ac0731de204b023a1e60d71b5d79.tar.gz |
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
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 e8f29306..139fa032 100755 --- a/js/stage/stage-view.reel/stage-view.js +++ b/js/stage/stage-view.reel/stage-view.js | |||
@@ -37,28 +37,6 @@ exports.StageView = Montage.create(Component, { | |||
37 | */ | 37 | */ |
38 | switchDocument:{ | 38 | switchDocument:{ |
39 | value: function(doc){ | 39 | value: function(doc){ |
40 | this.application.ninja.documentController._hideCurrentDocument(); | ||
41 | this.application.ninja.documentController.activeDocument = doc; | ||
42 | |||
43 | if(this.application.ninja.documentController.activeDocument.currentView === "design") { | ||
44 | this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument; | ||
45 | } | ||
46 | |||
47 | this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe | ||
48 | |||
49 | |||
50 | // this.application.ninja.documentController._showCurrentDocument(); | ||
51 | // Inline function below | ||
52 | if(this.activeDocument) { | ||
53 | this.activeDocument.container.style["display"] = "block"; | ||
54 | if(this.activeDocument.currentView === "design"){ | ||
55 | this.activeDocument.container.parentNode.style["display"] = "block"; | ||
56 | this.activeDocument.restoreAppState(); | ||
57 | } else { | ||
58 | //hide the iframe when switching to code view | ||
59 | document.getElementById("iframeContainer").style.display = "none"; | ||
60 | } | ||
61 | } | ||
62 | 40 | ||
63 | 41 | ||
64 | //focus editor | 42 | //focus editor |