diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel/iconsList.js')
-rwxr-xr-x | js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | 4 |
1 files changed, 4 insertions, 0 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 d36aa40f..230c7f64 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | |||
@@ -9,6 +9,10 @@ var Component = require("montage/ui/component").Component; | |||
9 | 9 | ||
10 | var IconsList = exports.IconsList = Montage.create(Component, { | 10 | var IconsList = exports.IconsList = Montage.create(Component, { |
11 | 11 | ||
12 | components: { | ||
13 | value: null | ||
14 | }, | ||
15 | |||
12 | anItemData:{ | 16 | anItemData:{ |
13 | enumerable:true, | 17 | enumerable:true, |
14 | value: null | 18 | value: null |