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

This commit is contained in:
Drew Willcoxon 2010-07-15 22:05:47 -07:00
parent 94d54bbb1f
commit a56b56170f

View File

@ -140,15 +140,22 @@
if (aTriggeringEvent instanceof MouseEvent && aTriggeringEvent.button == 2) if (aTriggeringEvent instanceof MouseEvent && aTriggeringEvent.button == 2)
return; // Do nothing for right clicks return; // Do nothing for right clicks
var [url, postData] = this._canonizeURL(aTriggeringEvent); var url = this.value;
if (!url) var postData = null;
return;
var action = this._parseActionUrl(url); var action = this._parseActionUrl(url);
if (action) { if (action) {
if (action.type == "switchtab") url = action.param;
switchToTabHavingURI(action.param); if (!(aTriggeringEvent && aTriggeringEvent.altKey)) {
return; if (action.type == "switchtab")
switchToTabHavingURI(url);
return;
}
}
else {
[url, postData] = this._canonizeURL(aTriggeringEvent);
if (!url)
return;
} }
this.value = url; this.value = url;