diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/components/ui/tree-basic | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/ui/tree-basic')
| -rwxr-xr-x | js/components/ui/tree-basic/tree.reel/tree.html | 11 | ||||
| -rwxr-xr-x | js/components/ui/tree-basic/treeItem.reel/treeItem.html | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html index 1990a4ef..f0c51fcc 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.html +++ b/js/components/ui/tree-basic/tree.reel/tree.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 | "treeItem": { | 13 | "treeItem": { |
| 14 | "module" : "js/components/ui/tree-basic/treeItem.reel", | 14 | "prototype" : "js/components/ui/tree-basic/treeItem.reel", |
| 15 | "name": "TreeItem", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "treeItem"} | 16 | "element": {"#": "treeItem"} |
| 18 | }, | 17 | }, |
| @@ -41,8 +40,7 @@ | |||
| 41 | }, | 40 | }, |
| 42 | 41 | ||
| 43 | "repetition1" : { | 42 | "repetition1" : { |
| 44 | "module": "montage/ui/repetition.reel", | 43 | "prototype": "montage/ui/repetition.reel", |
| 45 | "name": "Repetition", | ||
| 46 | "properties": { | 44 | "properties": { |
| 47 | "element": {"#": "treeView"} | 45 | "element": {"#": "treeView"} |
| 48 | }, | 46 | }, |
| @@ -56,8 +54,7 @@ | |||
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | "owner":{ | 56 | "owner":{ |
| 59 | "module": "js/components/ui/tree-basic/tree.reel", | 57 | "prototype": "js/components/ui/tree-basic/tree.reel", |
| 60 | "name": "Tree", | ||
| 61 | "properties" : { | 58 | "properties" : { |
| 62 | "element": {"#": "atree"}, | 59 | "element": {"#": "atree"}, |
| 63 | "components": [{"@": "repetition1"}] | 60 | "components": [{"@": "repetition1"}] |
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html index 3c5b19a9..9b8cb1ea 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.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/tree-basic/tree.reel", | 14 | "prototype": "js/components/ui/tree-basic/tree.reel[TreeItem]", |
| 15 | "name": "TreeItem", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element" : {"#": "atreeItem"}, | 16 | "element" : {"#": "atreeItem"}, |
| 18 | "itemName": {"#": "name"}, | 17 | "itemName": {"#": "name"}, |