diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/menu/menu-entry.reel | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/menu/menu-entry.reel')
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html index bba5e65d..7ebbcec8 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ b/js/components/menu/menu-entry.reel/menu-entry.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/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "entriesController": { | 14 | "entriesController": { |
| 15 | "name": "ArrayController", | 15 | "prototype": "montage/ui/controller/array-controller", |
| 16 | "module": "montage/ui/controller/array-controller", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "automaticallyOrganizeObjects": false | 17 | "automaticallyOrganizeObjects": false |
| 19 | }, | 18 | }, |
| @@ -27,8 +26,7 @@ | |||
| 27 | }, | 26 | }, |
| 28 | 27 | ||
| 29 | "repetition": { | 28 | "repetition": { |
| 30 | "module": "montage/ui/repetition.reel", | 29 | "prototype": "montage/ui/repetition.reel", |
| 31 | "name": "Repetition", | ||
| 32 | "properties": { | 30 | "properties": { |
| 33 | "element": { "#": "subEntries" }, | 31 | "element": { "#": "subEntries" }, |
| 34 | "contentController": {"@": "entriesController"} | 32 | "contentController": {"@": "entriesController"} |
| @@ -36,8 +34,7 @@ | |||
| 36 | }, | 34 | }, |
| 37 | 35 | ||
| 38 | "menuItem": { | 36 | "menuItem": { |
| 39 | "module": "js/components/menu/menu-item.reel", | 37 | "prototype": "js/components/menu/menu-item.reel", |
| 40 | "name": "MenuItem", | ||
| 41 | "properties": { | 38 | "properties": { |
| 42 | "element": { "#": "menuEntryItem" } | 39 | "element": { "#": "menuEntryItem" } |
| 43 | }, | 40 | }, |
| @@ -51,8 +48,7 @@ | |||
| 51 | }, | 48 | }, |
| 52 | 49 | ||
| 53 | "owner": { | 50 | "owner": { |
| 54 | "module": "js/components/menu/menu-entry.reel", | 51 | "prototype": "js/components/menu/menu-entry.reel", |
| 55 | "name": "MenuEntry", | ||
| 56 | "properties": { | 52 | "properties": { |
| 57 | "element": {"#": "menuItem"}, | 53 | "element": {"#": "menuItem"}, |
| 58 | "topHeader": {"#": "topHeaderBackground"}, | 54 | "topHeader": {"#": "topHeaderBackground"}, |