diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/menu/menu.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/menu/menu.reel')
| -rwxr-xr-x | js/components/menu/menu.reel/menu.html | 23 |
1 files changed, 9 insertions, 14 deletions
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": { |
| 70 | "element": {"#": "mainMenuBar"}, | 65 | "element": {"#": "mainMenuBar"}, |
| 71 | "controller": {"@": "menuController"}, | 66 | "controller": {"@": "menuController"}, |
| @@ -78,9 +73,9 @@ | |||
| 78 | </head> | 73 | </head> |
| 79 | <body> | 74 | <body> |
| 80 | 75 | ||
| 81 | <nav id="mainMenuBar" class="mainMenuBar unselectable"> | 76 | <nav data-montage-id="mainMenuBar" class="mainMenuBar unselectable"> |
| 82 | <ul id="topMenu" class="horizontal-menu"> | 77 | <ul data-montage-id="topMenu" class="horizontal-menu"> |
| 83 | <li id="menuItem"></li> | 78 | <li data-montage-id="menuItem"></li> |
| 84 | </ul> | 79 | </ul> |
| 85 | </nav> | 80 | </nav> |
| 86 | 81 | ||