nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1253284 - Allow reserved attribute without command attribute r=masayuki

Browse source 
MozReview-Commit-ID: A2aEOgTx5Jz

--HG--
extra : rebase_source : f0ecefde7d39b63caf1b69cb88e3ed49b1bef084
This commit is contained in:
Makoto Kato 2016-05-06 18:38:44 +09:00
parent 307e6f9842
commit fbbac87fd2
2 changed files with 2 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/base/content/browser-sets.inc
View file

@ -357,7 +357,7 @@
<key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/> <key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/> <key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/>
<key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" modifiers="accel"/> <key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" modifiers="accel" reserved="true"/>
#elifdef XP_UNIX #elifdef XP_UNIX
<key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" command="cmd_quitApplication" modifiers="accel"/> <key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" command="cmd_quitApplication" modifiers="accel"/>
#endif #endif

2
dom/xbl/nsXBLWindowKeyHandler.cpp
View file

@ -708,7 +708,7 @@ nsXBLWindowKeyHandler::WalkHandlersAndExecute(
bool isReserved = false; bool isReserved = false;
if (commandElement) { if (commandElement) {
if (!IsExecutableElement(commandElement)) { if (aExecute && !IsExecutableElement(commandElement)) {
continue; continue;
} }