aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel/iconsList.html')
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html11
1 files changed, 4 insertions, 7 deletions
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 0bb79873..35260527 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "pickerIcon": { 13 "pickerIcon": {
14 "module" : "js/components/ui/icon-list-basic/icon.reel", 14 "prototype" : "js/components/ui/icon-list-basic/icon.reel",
15 "name": "Icon",
16 "properties": { 15 "properties": {
17 "element": {"#": "icon"} 16 "element": {"#": "icon"}
18 }, 17 },
@@ -31,8 +30,7 @@
31 }, 30 },
32 31
33 "repetition1" : { 32 "repetition1" : {
34 "module": "montage/ui/repetition.reel", 33 "prototype": "montage/ui/repetition.reel",
35 "name": "Repetition",
36 "properties": { 34 "properties": {
37 "element": {"#": "iconsView"} 35 "element": {"#": "iconsView"}
38 }, 36 },
@@ -47,8 +45,7 @@
47 }, 45 },
48 46
49 "owner" : { 47 "owner" : {
50 "module" : "js/components/ui/icon-list-basic/iconsList.reel", 48 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
51 "name" : "IconsList",
52 "properties" : { 49 "properties" : {
53 "element" : {"#": "list"}, 50 "element" : {"#": "list"},
54 "components": [{"@": "repetition1"}] 51 "components": [{"@": "repetition1"}]