diff options
Diffstat (limited to 'js/components/menu')
-rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 24 | ||||
-rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.html | 24 | ||||
-rwxr-xr-x | js/components/menu/menu.reel/menu.html | 23 |
3 files changed, 29 insertions, 42 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..cd013a4e 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"}, |
@@ -66,13 +62,13 @@ | |||
66 | </head> | 62 | </head> |
67 | <body> | 63 | <body> |
68 | 64 | ||
69 | <li id="menuItem" class="topMenuItem"> | 65 | <li data-montage-id="menuItem" class="topMenuItem"> |
70 | <div id="topHeaderBackground" class="menubg"> | 66 | <div data-montage-id="topHeaderBackground" class="menubg"> |
71 | <span id="topHeaderText" class="menu-label"></span> | 67 | <span data-montage-id="topHeaderText" class="menu-label"></span> |
72 | </div> | 68 | </div> |
73 | 69 | ||
74 | <ul id="subEntries" class="subEntries" style="z-index: 9991;"> | 70 | <ul data-montage-id="subEntries" class="subEntries" style="z-index: 9991;"> |
75 | <li id="menuEntryItem"></li> | 71 | <li data-montage-id="menuEntryItem"></li> |
76 | </ul> | 72 | </ul> |
77 | 73 | ||
78 | </li> | 74 | </li> |
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html index d199a440..5ff8c0fc 100755 --- a/js/components/menu/menu-item.reel/menu-item.html +++ b/js/components/menu/menu-item.reel/menu-item.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-item.reel", | 51 | "prototype": "js/components/menu/menu-item.reel", |
55 | "name": "MenuItem", | ||
56 | "properties": { | 52 | "properties": { |
57 | "element": {"#": "menuItem"}, | 53 | "element": {"#": "menuItem"}, |
58 | "itemBackground": {"#": "menuItemBackground"}, | 54 | "itemBackground": {"#": "menuItemBackground"}, |
@@ -66,14 +62,14 @@ | |||
66 | </head> | 62 | </head> |
67 | <body> | 63 | <body> |
68 | 64 | ||
69 | <li id="menuItem" class="menuItem"> | 65 | <li data-montage-id="menuItem" class="menuItem"> |
70 | <div id="menuItemBackground" class="menubg"> | 66 | <div data-montage-id="menuItemBackground" class="menubg"> |
71 | <span class="check"></span> | 67 | <span class="check"></span> |
72 | <span id="menuItemText" class="menu-label"></span> | 68 | <span data-montage-id="menuItemText" class="menu-label"></span> |
73 | <span class="rightArrow"></span> | 69 | <span class="rightArrow"></span> |
74 | 70 | ||
75 | <ul id="subEntries" class="subEntries" style="display: none"> | 71 | <ul data-montage-id="subEntries" class="subEntries" style="display: none"> |
76 | <li id="menuEntryItem"></li> | 72 | <li data-montage-id="menuEntryItem"></li> |
77 | </ul> | 73 | </ul> |
78 | 74 | ||
79 | </div> | 75 | </div> |
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index 2cc6bf9b..49956f8a 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.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,13 +12,11 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "menudata": { | 14 | "menudata": { |
15 | "name": "MenuData", | 15 | "prototype": "js/data/menu-data" |
16 | "module": "js/data/menu-data" | ||
17 | }, | 16 | }, |
18 | 17 | ||
19 | "menuController": { | 18 | "menuController": { |
20 | "name": "ArrayController", | 19 | "prototype": "montage/ui/controller/array-controller", |
21 | "module": "montage/ui/controller/array-controller", | ||
22 | "properties": { | 20 | "properties": { |
23 | "automaticallyOrganizeObjects": false | 21 | "automaticallyOrganizeObjects": false |
24 | }, | 22 | }, |
@@ -32,8 +30,7 @@ | |||
32 | }, | 30 | }, |
33 | 31 | ||
34 | "repetition": { | 32 | "repetition": { |
35 | "module": "montage/ui/repetition.reel", | 33 | "prototype": "montage/ui/repetition.reel", |
36 | "name": "Repetition", | ||
37 | "properties": { | 34 | "properties": { |
38 | "element": { "#": "topMenu" }, | 35 | "element": { "#": "topMenu" }, |
39 | "contentController": {"@": "menuController"}, | 36 | "contentController": {"@": "menuController"}, |
@@ -42,8 +39,7 @@ | |||
42 | }, | 39 | }, |
43 | 40 | ||
44 | "menuEntry": { | 41 | "menuEntry": { |
45 | "module": "js/components/menu/menu-entry.reel", | 42 | "prototype": "js/components/menu/menu-entry.reel", |
46 | "name": "MenuEntry", | ||
47 | "properties": { | 43 | "properties": { |
48 | "element": { "#": "menuItem" } | 44 | "element": { "#": "menuItem" } |
49 | }, | 45 | }, |
@@ -64,8 +60,7 @@ | |||
64 | }, | 60 | }, |
65 | 61 | ||
66 | "owner": { | 62 | "owner": { |
67 | "module": "js/components/menu/menu.reel", | 63 | "prototype": "js/components/menu/menu.reel", |
68 | "name": "Menu", | ||
69 | "properties": { | 64 | "properties": { |