aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-08-20 14:54:44 -0700
committerEric Guzman2012-08-20 14:54:44 -0700
commit1e9d019867ff90840735ec531af5ebec9c7962e6 (patch)
tree887d28987a3113e84c771e264767c9462e9a8844 /js/panels
parenta34663e154af834176b758b6da368f634cd2a6bd (diff)
parent36d692a9fb216f2785a570d13c1beb27360c7305 (diff)
downloadninja-1e9d019867ff90840735ec531af5ebec9c7962e6.tar.gz
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 988088e3..586636e1 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -159,11 +159,24 @@ exports.Panel = Montage.create(Component, {
159 this.disabled = true; 159 this.disabled = true;
160 } else { 160 } else {
161 this.disabled = this._currentDocument.currentView !== "design"; 161 this.disabled = this._currentDocument.currentView !== "design";
162 this._currentDocument.addPropertyChangeListener("model.currentViewIdentifier", this, false);
162 } 163 }
163 164
164 } 165 }
165 }, 166 },
166 167
168 handleChange: {
169 value: function(notification) {
170 if(notification.currentPropertyPath === "model.currentViewIdentifier") {
171 if(this.currentDocument.model.currentView.identifier === "design-code") {
172 this.disabled = true;
173 } else {
174 this.disabled = false;
175 }
176 }
177 }
178 },
179
167 handleBtnCollapseAction: { 180 handleBtnCollapseAction: {
168 value: function() { 181 value: function() {
169 this.collapsed = !this.collapsed; 182 this.collapsed = !this.collapsed;