aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/icon.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/ui/icon-list-basic/icon.reel
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel')
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js12
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
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10var Icon = exports.Icon = Montage.create(Component, { 10exports.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,