зеркало из https://github.com/mozilla/pjs.git
Bug 441936 - accel + K should focus find field
This makes accel + K focus the search/find field in the download manager for all toolkit consumers that use the built in download manager. r=mconnor
This commit is contained in:
Родитель
798a4c1242
Коммит
9cb435669c
|
@ -39,6 +39,7 @@ file names and tall enough to hint that there are more downloads in the list -->
|
|||
<!ENTITY cmd.clearList.tooltip "Removes completed, canceled, and failed downloads from the list">
|
||||
<!ENTITY cmd.clearList.accesskey "C">
|
||||
<!ENTITY cmd.find.commandKey "f">
|
||||
<!ENTITY cmd.search.commandKey "k">
|
||||
|
||||
<!ENTITY closeWhenDone.label "Close when downloads complete">
|
||||
<!ENTITY closeWhenDone.tooltip "Closes the Downloads window when all files are done downloading">
|
||||
|
|
|
@ -105,6 +105,10 @@
|
|||
key="&cmd.find.commandKey;"
|
||||
modifiers="accel"
|
||||
command="cmd_findDownload"/>
|
||||
<key id="key_findDownload2"
|
||||
key="&cmd.search.commandKey;"
|
||||
modifiers="accel"
|
||||
command="cmd_findDownload"/>
|
||||
<key id="key_selectAllDownloads"
|
||||
key="&selectAllCmd.key;"
|
||||
modifiers="accel"
|
||||
|
|
|
@ -57,6 +57,7 @@ _CHROME_FILES = \
|
|||
test_removeDownload_updates_ui.xul \
|
||||
test_retention_is_0_closes.xul \
|
||||
test_search_clearlist.xul \
|
||||
test_search_keys.xul \
|
||||
test_select_all.xul \
|
||||
test_space_key_pauses_resumes.xul \
|
||||
test_ui_stays_open_on_alert_clickback.xul \
|
||||
|
|
|
@ -0,0 +1,136 @@
|
|||
<?xml version="1.0"?>
|
||||
<!--
|
||||
/* ***** 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 mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2008
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Shawn Wilsher <me@shawnwilsher.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 ***** */
|
||||
|
||||
/**
|
||||
* Make sure the download manager can display downloads in the right order and
|
||||
* contains the expected data. The list has one of each download state ordered
|
||||
* by the start/end times.
|
||||
*/
|
||||
-->
|
||||
|
||||
<window title="Download Manager Test"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="test();">
|
||||
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/MochiKit/packed.js"/>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
|
||||
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
const Cc = Components.classes;
|
||||
const Ci = Components.interfaces;
|
||||
const Cr = Components.results;
|
||||
|
||||
function test_meta_k(aWin)
|
||||
{
|
||||
let doc = aWin.document;
|
||||
let searchbox = doc.getElementById("searchbox");
|
||||
let richlistbox = doc.getElementById("downloadView");
|
||||
|
||||
// Enusre the serachbox is not focused
|
||||
richlistbox.focus();
|
||||
|
||||
// Dispatch the right key combination
|
||||
synthesizeKey("k", {accelKey: true}, aWin);
|
||||
|
||||
ok(searchbox.hasAttribute("focused"), "Searchbox is focused");
|
||||
}
|
||||
|
||||
let testFuncs = [
|
||||
test_meta_k,
|
||||
]
|
||||
|
||||
function test()
|
||||
{
|
||||
let dm = Cc["@mozilla.org/download-manager;1"].
|
||||
getService(Ci.nsIDownloadManager);
|
||||
|
||||
// See if the DM is already open, and if it is, close it!
|
||||
let wm = Cc["@mozilla.org/appshell/window-mediator;1"].
|
||||
getService(Ci.nsIWindowMediator);
|
||||
let win = wm.getMostRecentWindow("Download:Manager");
|
||||
if (win)
|
||||
win.close();
|
||||
|
||||
let os = Cc["@mozilla.org/observer-service;1"].
|
||||
getService(Ci.nsIObserverService);
|
||||
const DLMGR_UI_DONE = "download-manager-ui-done";
|
||||
|
||||
let testObs = {
|
||||
observe: function(aSubject, aTopic, aData)
|
||||
{
|
||||
if (aTopic != DLMGR_UI_DONE)
|
||||
return;
|
||||
|
||||
let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
|
||||
|
||||
// Now we can run our tests
|
||||
for each (let t in testFuncs)
|
||||
t(win);
|
||||
|
||||
win.close();
|
||||
os.removeObserver(testObs, DLMGR_UI_DONE);
|
||||
SimpleTest.finish();
|
||||
}
|
||||
};
|
||||
|
||||
// Register with the observer service
|
||||
os.addObserver(testObs, DLMGR_UI_DONE, false);
|
||||
|
||||
// Show the Download Manager UI
|
||||
Cc["@mozilla.org/download-manager-ui;1"].
|
||||
getService(Ci.nsIDownloadManagerUI).show();
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display:none;"></div>
|
||||
<pre id="test"></pre>
|
||||
</body>
|
||||
</window>
|
Загрузка…
Ссылка в новой задаче