diff options
author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/panels/Panel.reel/Panel.js | |
parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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; |