aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-22 16:26:41 -0800
committerArmen Kesablyan2012-02-22 16:26:41 -0800
commit0bd1cefea2ab350fad1a891bdc926053b799aafc (patch)
tree962f559fcc02a3dfeb297d59907e40fa153453f3 /js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
parent695bc5082f48dddf66ce31480a4faefc067b38bd (diff)
parent2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff)
downloadninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz
Merge branch 'refs/heads/master' into new-tool-icons
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.js8
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() {