aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel/menu-entry.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/components/menu/menu-entry.reel/menu-entry.html
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/components/menu/menu-entry.reel/menu-entry.html')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html14
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"},