diff options
author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | |
parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel/iconsList.js')
-rwxr-xr-x[-rw-r--r--] | js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js index 56eb57c3..d36aa40f 100644..100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | |||
@@ -15,11 +15,17 @@ var IconsList = exports.IconsList = Montage.create(Component, { | |||
15 | }, | 15 | }, |
16 | 16 | ||
17 | iconsViewDataObject:{ | 17 | iconsViewDataObject:{ |
18 | writable:true, | 18 | writable:true, |
19 | enumerable:true, | 19 | enumerable:true, |
20 | value:[] | 20 | value:[] |
21 | }, | 21 | }, |
22 | 22 | ||
23 | selected:{ | ||
24 | writable:true, | ||
25 | enumerable:true, | ||
26 | value:null | ||
27 | }, | ||
28 | |||
23 | willDraw: { | 29 | willDraw: { |
24 | enumerable: false, | 30 | enumerable: false, |
25 | value: function() { | 31 | value: function() { |