diff options
author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/components/menu/menu-entry.reel | |
parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz |
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/components/menu/menu-entry.reel')
-rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.css | 89 | ||||
-rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 97 | ||||
-rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.js | 140 |
3 files changed, 0 insertions, 326 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.css b/js/components/menu/menu-entry.reel/menu-entry.css deleted file mode 100755 index 6f05d09c..00000000 --- a/js/components/menu/menu-entry.reel/menu-entry.css +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | |||
5 | Redistribution and use in source and binary forms, with or without | ||
6 | modification, 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 | |||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
29 | POSSIBILITY OF SUCH DAMAGE. | ||
30 | </copyright> */ | ||
31 | |||
32 | .topMenuItem { | ||
33 | float: left; | ||
34 | display: inline; | ||
35 | } | ||
36 | |||
37 | .topMenuItem .menubg{ | ||
38 | color: #f7f7f7; | ||
39 | } | ||
40 | |||
41 | .topMenuItem .menuName { | ||
42 | font-family: 'Droid Sans', sans-serif; | ||
43 | font-size: 10pt; | ||
44 | padding: 3px 12px 3px 8px; | ||
45 | text-shadow : 1px 1px 1px #000000; | ||
46 | } | ||
47 | |||
48 | .menubg{ | ||
49 | display: inline; | ||
50 | } | ||
51 | |||
52 | .menubg.checked .check { | ||
53 | opacity: 1; | ||
54 | } | ||
55 | |||
56 | .selected { | ||
57 | background-color: #7F7F7F; | ||
58 | } | ||
59 | |||
60 | .menu-label { | ||
61 | font-family: 'Droid Sans', sans-serif; | ||
62 | font-size: 10pt; | ||
63 | padding: 3px 12px 3px 8px; | ||
64 | text-shadow: 1px 1px 1px black; | ||
65 | } | ||
66 | |||
67 | .subEntries{ | ||
68 | position: absolute; | ||
69 | z-index: 100000; | ||
70 | float:left; | ||
71 | font-family: 'Droid Sans', sans-serif !important; | ||
72 | color: #ffffff; | ||
73 | background: #494949; | ||
74 | border: 1px solid #292929; | ||
75 | border-radius: 8px; | ||
76 | padding: 8px 0px 8px 0px; | ||
77 | box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8); | ||
78 | white-space:nowrap; | ||
79 | } | ||
80 | |||
81 | .menuItem { | ||
82 | font-size: 9pt; | ||
83 | padding: 4px 8px; | ||
84 | display: block; | ||
85 | float: none; | ||
86 | position: relative; | ||
87 | background: #474747; | ||
88 | color: white; | ||
89 | } | ||
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html deleted file mode 100755 index ddac73ab..00000000 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | Copyright (c) 2012, Motorola Mobility LLC. | ||
4 | All Rights Reserved. | ||
5 | |||
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, 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 | |||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
27 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
28 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
30 | POSSIBILITY 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-entry.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.data.entries"} | ||
46 | } | ||
47 | }, | ||
48 | |||
49 | "repetition": { | ||
50 | "prototype": "montage/ui/repetition.reel", | ||
51 | "properties": { | ||
52 | "element": { "#": "subEntries" } | ||
53 | }, | ||
54 | "bindings": { | ||
55 | "objects": {"<-": "@owner.data.entries"} | ||
56 | } | ||
57 | }, | ||
58 | |||
59 | "menuItem": { | ||
60 | "prototype": "js/components/menu/menu-item.reel", | ||
61 | "properties": { | ||
62 | "element": { "#": "menuEntryItem" } | ||
63 | }, | ||
64 | "bindings": { | ||
65 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, | ||
66 | "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"} | ||
67 | } | ||
68 | }, | ||
69 | |||
70 | "owner": { | ||
71 | "prototype": "js/components/menu/menu-entry.reel", | ||
72 | "properties": { | ||
73 | "element": {"#": "menuItem"}, | ||
74 | "topHeader": {"#": "topHeaderBackground"}, | ||
75 | "topHeaderText": {"#": "topHeaderText"}, | ||
76 | "subEntries": {"#": "subEntries"} | ||
77 | } | ||
78 | } | ||
79 | } | ||
80 | </script> | ||
81 | |||
82 | </head> | ||
83 | <body> | ||
84 | |||
85 | <li data-montage-id="menuItem" class="topMenuItem"> | ||
86 | <div data-montage-id="topHeaderBackground" class="menubg"> | ||
87 | <span data-montage-id="topHeaderText" class="menu-label"></span> | ||
88 | </div> | ||
89 | |||
90 | <ul data-montage-id="subEntries" class="subEntries" style="z-index: 9991;"> | ||
91 | <li data-montage-id="menuEntryItem"></li> | ||
92 | </ul> | ||
93 | |||
94 | </li> | ||
95 | |||
96 | </body> | ||
97 | </html> | ||
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js deleted file mode 100755 index 10b49417..00000000 --- a/js/components/menu/menu-entry.reel/menu-entry.js +++ /dev/null | |||
@@ -1,140 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | |||
5 | Redistribution and use in source and binary forms, with or without | ||
6 | modification, 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 | |||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||