aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-07-09 16:52:49 -0700
committerAnanya Sen2012-07-09 16:52:49 -0700
commit2eb84584f44b8c774479d1af2ee1d810597474cf (patch)
tree64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/components/menu/menu-item.reel
parentbf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff)
parentcee0deca695359ab468bd06d0e05ed3b2010b338 (diff)
downloadninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/menu/menu-item.reel')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.css25
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html25
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js53
3 files changed, 59 insertions, 44 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.css b/js/components/menu/menu-item.reel/menu-item.css
index 298d706d..95fd673c 100755
--- a/js/components/menu/menu-item.reel/menu-item.css
+++ b/js/components/menu/menu-item.reel/menu-item.css
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 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.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -33,10 +34,12 @@ POSSIBILITY OF SUCH DAMAGE.
33 font-size: 10pt; 34 font-size: 10pt;
34 padding: 3px 12px 3px 8px; 35 padding: 3px 12px 3px 8px;
35 text-shadow : 1px 1px 1px #000000; 36 text-shadow : 1px 1px 1px #000000;
37 cursor:pointer;
36} 38}
37 39
38.menuItem:hover { 40.menuItem:hover {
39 background-color: #7f7f7f; 41 background-color: #7f7f7f;
42 cursor:pointer;
40} 43}
41 44
42.menubg .subEntries { 45.menubg .subEntries {
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index ce46d857..d89a9ab0 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.html
@@ -1,25 +1,26 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
9 8
10 - Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer. 10 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright 11
13 notice, this list of conditions and the following disclaimer in the 12* Redistributions in binary form must reproduce the above copyright notice,
14 documentation and/or other materials provided with the distribution. 13 this list of conditions and the following disclaimer in the documentation
15 - Neither the name of Motorola Mobility nor the names of its contributors 14 and/or other materials provided with the distribution.
16 may be used to endorse or promote products derived from this software 15
17 without specific prior written permission. 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.
18 19
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 320611c5..63cc79b7 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 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.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -120,18 +121,15 @@ exports.MenuItem = Montage.create(Component, {
120 121
121 if(this.data.submenu) { 122 if(this.data.submenu) {
122 this.submenu = true; 123 this.submenu = true;
123
124 this.subentries = this.data.entries; 124 this.subentries = this.data.entries;
125
126 this.subMenu.classList.add("subMenu"); 125 this.subMenu.classList.add("subMenu");
127 this.element.addEventListener("mouseover", this, false);
128 this.element.addEventListener("mouseout", this, false);
129
130 } 126 }
131 127
128 this.element.addEventListener("mouseover", this, false);
129 this.element.addEventListener("mouseout", this, false);
132 130
133 this.itemText.innerHTML = this.data.displayText; 131 this.itemText.innerHTML = this.data.displayText;
134 this.element.addEventListener("mousedown", this, true); 132 this.element.addEventListener("mouseup", this, true);
135 } 133 }
136 }, 134 },
137 135
@@ -156,10 +154,13 @@ exports.MenuItem = Montage.create(Component, {
156 } 154 }
157 }, 155 },
158 156
159 captureMousedown: { 157 captureMouseup: {
160 value: function(event) { 158 value: function(event) {
161 159
162 if(this.data.radio && this.checked) return; 160 if(this.data.radio && this.checked){
161 this.parentComponent.ownerComponent.toggleOnMenuItemAction();
162 return;
163 }
163 164
164 if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) { 165 if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) {
165 if(this.data.action) { 166 if(this.data.action) {
@@ -167,6 +168,7 @@ exports.MenuItem = Montage.create(Component, {
167 } else if(this.checked !== null) { 168 } else if(this.checked !== null) {
168 this.checked = !this.checked; 169 this.checked = !this.checked;
169 } 170 }
171 this.parentComponent.ownerComponent.toggleOnMenuItemAction();
170 } 172 }
171 173
172 } 174 }
@@ -174,13 +176,22 @@ exports.MenuItem = Montage.create(Component, {
174