aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel/menu.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.reel/menu.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.reel/menu.html')
-rwxr-xr-xjs/components/menu/menu.reel/menu.html17
1 files changed, 6 insertions, 11 deletions
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"},