diff options
author | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
commit | 34804fa77191a08fcdaa8ca1992b38e60094f3ae (patch) | |
tree | 9eafadc20bb792b4058572ff1e12440428fe7c74 /js/panels | |
parent | a9ff54e7490761a7c0ad572d060ee386179d11df (diff) | |
parent | c88752d621069b12f978c1fd88ffdd52537a4657 (diff) | |
download | ninja-34804fa77191a08fcdaa8ca1992b38e60094f3ae.tar.gz |
Merge branch 'refs/heads/v0.7.2'
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 13 |
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; |