aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-23 16:09:45 -0700
committerNivesh Rajbhandari2012-05-23 16:09:45 -0700
commitd874b959bc297fed31d3ef3c2a7c8c77df88f761 (patch)
treed36a0b464aed1f3ff91c81df3aaf52df72451472 /js/panels
parentf97590388467b5a3316f6f155162fc293915fddc (diff)
parent0ca1910df1c78116139664bf39a95cf0ec7c8dc8 (diff)
downloadninja-d874b959bc297fed31d3ef3c2a7c8c77df88f761.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js7
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
2 files changed, 6 insertions, 3 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 0640abb2..f0fb1a45 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,8 +111,9 @@ exports.Splitter = Montage.create(Component, {
111 } else { 111 } else {
112 this.panel.removeEventListener("webkitTransitionEnd", this, false); 112 this.panel.removeEventListener("webkitTransitionEnd", this, false);
113 } 113 }
114 114 if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
115 this.application.ninja.stage.resizeCanvases = true; 115 this.application.ninja.stage.resizeCanvases = true;
116 }
116 } 117 }
117 }, 118 },
118 119
@@ -149,6 +150,7 @@ exports.Splitter = Montage.create(Component, {
149 this.panel.addEventListener("webkitTransitionEnd", this, false); 150 this.panel.addEventListener("webkitTransitionEnd", this, false);
150 } 151 }
151 this._collapsed = true; 152 this._collapsed = true;
153 this.disabled = true;
152 this.needsDraw = true; 154 this.needsDraw = true;
153 } 155 }
154 } 156 }
@@ -169,6 +171,7 @@ exports.Splitter = Montage.create(Component, {
169 } else { 171 } else {
170 this.panel.addEventListener("webkitTransitionEnd", this, false); 172 this.panel.addEventListener("webkitTransitionEnd", this, false);
171 } 173 }
174 this.disabled = false;
172 this.needsDraw = true; 175 this.needsDraw = true;
173 } 176 }
174 } 177 }
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 80133edf..2c02e544 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -596,7 +596,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
596 596
597 // That's all we need to do for a brand new file. 597 // That's all we need to do for a brand new file.
598 // But what if we're opening an existing document? 598 // But what if we're opening an existing document?
599 if (!this.application.ninja.documentController.creatingNewFile) { 599 if (!this.application.ninja.documentController.creatingNewFile && this.application.ninja.currentDocument.currentView !== "code") {
600 // Opening an existing document. If it has DOM elements we need to restore their timeline info 600 // Opening an existing document. If it has DOM elements we need to restore their timeline info
601 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 601 if (this.application.ninja.currentDocument.documentRoot.children[0]) {
602 // Yes, it has DOM elements. Loop through them and create a new object for each. 602 // Yes, it has DOM elements. Loop through them and create a new object for each.