зеркало из https://github.com/mozilla/pjs.git
Bug 567309 - FAYT is broken. Review and test done by Gavin.
This commit is contained in:
Родитель
e3884f253a
Коммит
b27c4b0626
|
@ -2163,6 +2163,23 @@
|
|||
if (aEvent.altKey)
|
||||
return;
|
||||
|
||||
// We need to take care of FAYT-watching as long as the findbar
|
||||
// isn't initialized. The checks on aEvent are copied from
|
||||
// _shouldFastFind (see findbar.xml).
|
||||
if (!gFindBarInitialized &&
|
||||
!(aEvent.ctrlKey || aEvent.metaKey) &&
|
||||
!aEvent.getPreventDefault()) {
|
||||
var charCode = aEvent.charCode;
|
||||
if (charCode) {
|
||||
var char = String.fromCharCode(charCode);
|
||||
if (char == "'" || char == "/" ||
|
||||
gPrefService.getBoolPref("accessibility.typeaheadfind")) {
|
||||
gFindBar._onBrowserKeypress(aEvent);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
if (!aEvent.metaKey)
|
||||
return;
|
||||
|
|
|
@ -81,6 +81,7 @@ _TEST_FILES = \
|
|||
# 480169)
|
||||
|
||||
_BROWSER_FILES = \
|
||||
browser_typeAheadFind.js \
|
||||
browser_NetworkPrioritizer.js \
|
||||
browser_allTabsPanel.js \
|
||||
browser_alltabslistener.js \
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
/* ***** 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 typeaheadfind test code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* the Mozilla Foundation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Gavin Sharp <gavin@gavinsharp.com> (Original Author)
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
function test() {
|
||||
waitForExplicitFinish();
|
||||
ok(!gFindBarInitialized, "find bar is not yet initialized");
|
||||
|
||||
gBrowser.selectedBrowser.addEventListener("pageshow", function () {
|
||||
ok(true, "Load listener called");
|
||||
gBrowser.selectedBrowser.removeEventListener("pageshow", arguments.callee, false);
|
||||
|
||||
waitForFocus(onFocus, content);
|
||||
}, false);
|
||||
|
||||
gBrowser.loadURI("data:text/html,<h1>A Page</h1>");
|
||||
}
|
||||
|
||||
function onFocus() {
|
||||
ok(!gFindBarInitialized, "find bar is not yet initialized");
|
||||
EventUtils.synthesizeKey("/", {});
|
||||
ok(gFindBarInitialized, "find bar is now initialized");
|
||||
|
||||
gBrowser.addTab();
|
||||
gBrowser.removeCurrentTab();
|
||||
finish();
|
||||
}
|
Загрузка…
Ссылка в новой задаче