diff options
| author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
| commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
| tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/components/ui/icon-list-basic | |
| parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/ui/icon-list-basic')
| -rwxr-xr-x | js/components/ui/icon-list-basic/icon.reel/icon.html | 5 | ||||
| -rwxr-xr-x | js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html index fc197e8c..f2406566 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.html +++ b/js/components/ui/icon-list-basic/icon.reel/icon.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 | "owner":{ | 13 | "owner":{ |
| 14 | "module": "js/components/ui/icon-list-basic/iconsList.reel", | 14 | "prototype": "js/components/ui/icon-list-basic/iconsList.reel[Icon]", |
| 15 | "name":"Icon", | ||
| 16 | "properties":{ | 15 | "properties":{ |
| 17 | "element": {"#" : "icon"}, | 16 | "element": {"#" : "icon"}, |
| 18 | "iconImg": {"#": "iconImg"}, | 17 | "iconImg": {"#": "iconImg"}, |
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"}] |