aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-26 14:58:10 -0700
committerJon Reid2012-06-26 14:58:10 -0700
commit2599f74d72293b809929d8a0b36fb8e721f194cd (patch)
treeca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/panels/Panel.reel
parentab9d14780eed98f39786fae4518e69861b34bad7 (diff)
parente4304b9ac6c58802de4dd334be1f5802533f5160 (diff)
downloadninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Panel.reel')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js10
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;