aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/menu/menu-item.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-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-item.reel')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html24
1 files changed, 10 insertions, 14 deletions
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>