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

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

View File

@ -357,7 +357,7 @@
<key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
#ifdef XP_MACOSX
<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
<key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" command="cmd_quitApplication" modifiers="accel"/>
#endif

View File

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