Bug 315195 - Select wrong default font if I close the preferences window with Command + W shortcut. r=mconnor

This commit is contained in:
mozilla.mano%sent.com 2006-01-01 10:58:00 +00:00
parent 6f17959796
commit 3c7fa9bcc7

View File

@ -534,9 +534,6 @@
<xul:hbox>
<children/>
</xul:hbox>
<xul:keyset>
<xul:key anonid="keyClose" key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
</xul:keyset>
</content>
<implementation implements="nsITimerCallback">
<constructor>
@ -563,16 +560,6 @@
cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
#endif
}
else {
// No Cmd+W in non-instant-apply preferences windows
var keyClose = document.getAnonymousElementByAttribute(this, "anonid", "keyClose");
keyClose.parentNode.removeChild(keyClose);
}
}
else {
// No Cmd+W in child dialogs
var keyClose = document.getAnonymousElementByAttribute(this, "anonid", "keyClose");
keyClose.parentNode.removeChild(keyClose);
}
var panes = this.preferencePanes;
@ -1056,6 +1043,11 @@
event.originalTarget.parentNode.parentNode.showPane(pane);
}
</handler>
<handler event="keypress" key="&windowClose.key;" modifiers="accel" phase="capturing">
if (this.instantApply)
window.close();
</handler>
</handlers>
</binding>