diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/ui/icon-list-basic/icon.reel/icon.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel/icon.js')
-rwxr-xr-x | js/components/ui/icon-list-basic/icon.reel/icon.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js index 7d36bc59..cfda4a1a 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.js +++ b/js/components/ui/icon-list-basic/icon.reel/icon.js | |||
@@ -7,7 +7,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | var Icon = exports.Icon = Montage.create(Component, { | 10 | exports.Icon = Montage.create(Component, { |
11 | |||
12 | iconImg: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | iconLabel: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
11 | 21 | ||
12 | _icondata:{ | 22 | _icondata:{ |
13 | enumerable : false, | 23 | enumerable : false, |