Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 17:24:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 628165 - Windows key should not be mapped to Panorama search

Browse Source 
r=dietrich
feedback=fryn
a=blocking
This commit is contained in:
Ian Gilman 2011-02-03 11:51:17 -08:00
parent a6e86820a2
commit 62352411ea
2 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/tabview/search.js
View File

@ -359,6 +359,8 @@ SearchEventHandlerClass.prototype = {
(event.keyCode >= event.DOM_VK_F1 &&
event.keyCode <= event.DOM_VK_SCROLL_LOCK) ||
event.keyCode == event.DOM_VK_META ||
event.keyCode == 91 || // 91 = left windows key
event.keyCode == 92 || // 92 = right windows key
(!event.keyCode && !event.charCode)) {
return;
}

52
browser/base/content/test/tabview/browser_tabview_bug628165.js
View File

@ -1,52 +1,20 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is a test for bug 628165.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Tim Taubert <tim.taubert@gmx.de>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
function test() {
let cw;
let sendWindowsKey = function () {
let testEnableSearchWithWindowsKey = function () {
let utils = cw.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils);
utils.sendKeyEvent('keydown', 0, 0, 0);
}
let testEnableSearchWithWindowsKey = function () {
sendWindowsKey();
ok(!cw.isSearchEnabled(), 'search is not enabled');
// we test 0, for Linux, and 91 (left) and 92 (right) for windows
let keyCodes = [0, 91, 92];
keyCodes.forEach(function(keyCode) {
utils.sendKeyEvent("keydown", keyCode, 0, 0);
ok(!cw.isSearchEnabled(), "search is not enabled with keyCode: " + keyCode);
});
hideTabView(finish);
}