diff options
author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /js/panels/Panel.reel/Panel.js | |
parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js index 15eb4da9..16643813 100755 --- a/js/panels/Panel.reel/Panel.js +++ b/js/panels/Panel.reel/Panel.js | |||
@@ -13,6 +13,10 @@ exports.Panel = Montage.create(Component, { | |||
13 | value: "Panel" | 13 | value: "Panel" |
14 | }, | 14 | }, |
15 | 15 | ||
16 | groups: { | ||
17 | value: [] | ||
18 | }, | ||
19 | |||
16 | panelContent: { | 20 | panelContent: { |
17 | value: null, | 21 | value: null, |
18 | serializable: true | 22 | serializable: true |
@@ -154,6 +158,12 @@ exports.Panel = Montage.create(Component, { | |||
154 | this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create(); | 158 | this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create(); |
155 | } | 159 | } |
156 | 160 | ||
161 | if(this.groups) { | ||
162 | this.groups.forEach(function(className) { | ||
163 | this.element.classList.add(className); | ||
164 | }.bind(this)); | ||
165 | } | ||
166 | |||
157 | if(this.modulePath && this.moduleName) { | 167 | if(this.modulePath && this.moduleName) { |
158 | // Load the slot content | 168 | // Load the slot content |
159 | var that = this; | 169 | var that = this; |