aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-17 23:34:57 -0700
committerValerio Virgillito2012-07-17 23:34:57 -0700
commit8f78cb1377009dabde95f4a81d5090b79b9de0da (patch)
tree4b984909acba691eac8376e3b60412f632e3cdc3 /js/components/menu/menu-item.reel
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-8f78cb1377009dabde95f4a81d5090b79b9de0da.tar.gz
menu design update and bug fixes - Moved Preview to the document bar
- Redesigned the menu and improved DOM structure. - Removed un-used entires - Fixed layout and snap entries - Moved the preview button to the document bar. - Fixes for bugs: #1750, #1867, #1876, #1895 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/menu/menu-item.reel')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.css99
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html97
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js198
3 files changed, 0 insertions, 394 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.css b/js/components/menu/menu-item.reel/menu-item.css
deleted file mode 100755
index 95fd673c..00000000
--- a/js/components/menu/menu-item.reel/menu-item.css
+++ /dev/null
@@ -1,99 +0,0 @@
1/* <copyright>
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10
11* Redistributions in binary form must reproduce the above copyright notice,
12 this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution.
14
15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */
31
32.menuItem .menuName {
33 font-family: 'Droid Sans', sans-serif;
34 font-size: 10pt;
35 padding: 3px 12px 3px 8px;
36 text-shadow : 1px 1px 1px #000000;
37 cursor:pointer;
38}
39
40.menuItem:hover {
41 background-color: #7f7f7f;
42 cursor:pointer;
43}
44
45.menubg .subEntries {
46 top: 0%;
47 left: 100%;
48 width: auto;
49 white-space:nowrap;
50}
51
52.itemSeparator:hover {
53 background-color: #474747;
54}
55
56.separator{
57 width:100%;
58 height:2px;
59 position: relative;
60 border: 1px groove #474747 ;
61 border-radius: 2px;
62 background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#474747), to(#cccccc));
63 opacity: 0.5;
64}
65
66.disabled {
67 opacity: 0.5;
68}
69
70.disabled:hover {
71 background-color: #474747;
72}
73
74.menubg .check {
75 float:left;
76 background-image: url(../../../../images/menu/checkmark.png);
77 background-repeat: no-repeat;
78 background-position: center;
79 width: 10px;
80 height: 15px;
81 opacity: 0;
82}
83
84.menubg.submenu .rightArrow {
85 float: right;
86 background-image:url('../../../../images/menu/arrow.png');
87 background-repeat: no-repeat;
88 background-position: center;
89 width: 10px;
90 height: 15px;
91 position: absolute;
92 right:4px;
93 top: 5px;
94 margin-left: 8px;
95}
96
97.subEntries.subMenu .rightArrow {
98 opacity: 0;
99}
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
deleted file mode 100755
index 364a0997..00000000
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ /dev/null
@@ -1,97 +0,0 @@
1<!DOCTYPE html>
2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8
9* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer.
11
12* Redistributions in binary form must reproduce the above copyright notice,
13 this list of conditions and the following disclaimer in the documentation
14 and/or other materials provided with the distribution.
15
16* Neither the name of Motorola Mobility LLC nor the names of its
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
19
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31</copyright> -->
32<html>
33<head>
34 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
35 <link rel="stylesheet" type="text/css" href="menu-item.css">
36
37 <script type="text/montage-serialization">
38 {
39 "entriesController": {
40 "prototype": "montage/ui/controller/array-controller",
41 "properties": {
42 "automaticallyOrganizeObjects": false
43 },
44 "bindings": {
45 "content": {"<-": "@owner.subentries"}
46 }
47 },
48
49 "repetition": {
50 "prototype": "montage/ui/repetition.reel",
51 "properties": {
52 "element": {"#": "subEntries"},
53 "contentController": {"@": "entriesController"}
54 }
55 },
56
57 "menuItem": {
58 "prototype": "js/components/menu/menu-item.reel",
59 "properties": {
60 "element": {"#": "menuEntryItem" }
61 },
62 "bindings": {
63 "data": {"<-": "@repetition.objectAtCurrentIteration"},
64 "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
65 }
66 },
67
68 "owner": {
69 "prototype": "js/components/menu/menu-item.reel",
70 "properties": {
71 "element": {"#": "menuItem"},
72 "itemBackground": {"#": "menuItemBackground"},
73 "itemText": {"#": "menuItemText"},
74 "subMenu": {"#": "subEntries"}
75 }
76 }
77 }
78 </script>
79
80</head>
81<body>
82
83 <li data-montage-id="menuItem" class="menuItem">
84 <div data-montage-id="menuItemBackground" class="menubg">
85 <span class="check"></span>
86 <span data-montage-id="menuItemText" class="menu-label"></span>
87 <span class="rightArrow"></span>
88
89 <ul data-montage-id="subEntries" class="subEntries" style="display: none">
90 <li data-montage-id="menuEntryItem"></li>
91 </ul>
92
93 </div>
94 </li>
95
96</body>
97</html>
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
deleted file mode 100755
index 63cc79b7..00000000
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ /dev/null
@@ -1,198 +0,0 @@
1/* <copyright>
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10
11* Redistributions in binary form must reproduce the above copyright notice,
12 this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution.
14
15* Neither the name of Motorola Mobility LLC nor the names of its
1