--- a/toolkit/content/tests/widgets/test_datepicker.xul
+++ b/toolkit/content/tests/widgets/test_datepicker.xul
@@ -13,18 +13,19 @@
<hbox onpopupshown="testtag_datepicker_UI_popup()"
onpopuphidden="testtag_finish()">
<datepicker id="datepicker"/>
<datepicker id="datepicker-popup" type="popup"/>
<datepicker id="datepicker-grid" type="grid"/>
</hbox>
+<!-- Test-only key bindings, but must not conflict with the application. -->
<keyset id="mainKeyset">
- <key id="key_alt_q" key="Q" oncommand="return" modifiers="alt"/>
+ <key id="key_alt_z" key="Z" oncommand="return" modifiers="alt"/>
<key id="key_ctrl_q" key="Q" oncommand="return" modifiers="control"/>
<key id="key_meta_e" key="E" oncommand="return" modifiers="meta"/>
</keyset>
<body xmlns="http://www.w3.org/1999/xhtml">
<p id="display"></p>
<div id="content" style="display: none">
</div>
@@ -184,17 +185,17 @@ function testtag_datepicker_UI_fields(dp
testtag_datepicker_UI_key(dp, testid, "2003-06-01", dp.dateField, 2003, 5, 2, 2003, 5, 1);
testtag_datepicker_UI_key(dp, testid, "2003-06-30", dp.dateField, 2003, 5, 1, 2003, 5, 30);
testtag_datepicker_UI_key(dp, testid, "1600-02-28", dp.dateField, 1600, 1, 29, 1600, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2000-02-28", dp.dateField, 2000, 1, 29, 2000, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2003-02-28", dp.dateField, 2003, 1, 1, 2003, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2004-02-28", dp.dateField, 2004, 1, 29, 2004, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2100-02-28", dp.dateField, 2100, 1, 1, 2100, 1, 28);
- synthesizeKeyExpectEvent('Q', { altKey: true }, $("key_alt_q"), "command", testid + " alt shortcut");
+ synthesizeKeyExpectEvent('Z', { altKey: true }, $("key_alt_z"), "command", testid + " alt shortcut");
synthesizeKeyExpectEvent('Q', { ctrlKey: true }, $("key_ctrl_q"), "command", testid + " ctrl shortcut");
synthesizeKeyExpectEvent('E', { metaKey: true }, $("key_meta_e"), "command", testid + " meta shortcut");
}
function testtag_datepicker_UI_grid(dp, type, testid)
{
testid += "UI ";
