Bug 571672 - On switch-to-tab results, Alt+Enter should open the page in a new tab, and Ctrl+Enter should switch to tab as expected. r=gavin
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -135,25 +135,32 @@
</method>
<method name="handleCommand">
<parameter name="aTriggeringEvent"/>
<body><![CDATA[
if (aTriggeringEvent instanceof MouseEvent && aTriggeringEvent.button == 2)
return; // Do nothing for right clicks
- var [url, postData] = this._canonizeURL(aTriggeringEvent);
- if (!url)
- return;
+ var url = this.value;
+ var postData = null;
var action = this._parseActionUrl(url);
if (action) {
- if (action.type == "switchtab")
- switchToTabHavingURI(action.param);
- return;
+ url = action.param;
+ if (!(aTriggeringEvent && aTriggeringEvent.altKey)) {
+ if (action.type == "switchtab")
+ switchToTabHavingURI(url);
+ return;
+ }
+ }
+ else {
+ [url, postData] = this._canonizeURL(aTriggeringEvent);
+ if (!url)
+ return;
}
this.value = url;
gBrowser.userTypedValue = url;
try {
addToUrlbarHistory(url);
} catch (ex) {
// Things may go wrong when adding url to session history,