aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/components/menu
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/menu')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html14
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html14
-rwxr-xr-xjs/components/menu/menu.reel/menu.html17
3 files changed, 16 insertions, 29 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"},
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index d199a440..92e9aafc 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"},
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index 2cc6bf9b..adaf68ea 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": {
70 "element": {"#": "mainMenuBar"}, 65 "element": {"#": "mainMenuBar"},
71 "controller": {"@": "menuController"}, 66 "controller": {"@": "menuController"},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 07:05:14 +0000