diff options
author | Jonathan Duran | 2012-03-08 19:55:13 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-08 19:55:13 -0800 |
commit | dae6290c5f779dbff1d3b508615898b1ec26bb18 (patch) | |
tree | 40825a2f6ed82b015aaf76b1b79238e269a89ea6 /js/panels/Panel.reel/Panel.js | |
parent | 1c61c69265b9c0230b834c0d4d7c78a11f9d5b19 (diff) | |
parent | b96c5803a90e028af20f8ebce441d7a57608b99e (diff) | |
download | ninja-dae6290c5f779dbff1d3b508615898b1ec26bb18.tar.gz |
Merge branch 'refs/heads/SerialKiller' into TimelineUber
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js index 2b308258..33f9b3a7 100755 --- a/js/panels/Panel.reel/Panel.js +++ b/js/panels/Panel.reel/Panel.js | |||
@@ -57,6 +57,10 @@ exports.Panel = Montage.create(Component, { | |||
57 | value: null | 57 | value: null |
58 | }, | 58 | }, |
59 | 59 | ||
60 | disabled: { | ||
61 | value:false | ||
62 | }, | ||
63 | |||
60 | collapsed: { | 64 | collapsed: { |
61 | get: function() { | 65 | get: function() { |
62 | return this._collapsed; | 66 | return this._collapsed; |