Bug 218447 keyword query ignored for queries beginning www or http or ending in / p=mook_moz@yahoo.com r=pch

This commit is contained in:
neil%parkwaycc.co.uk 2004-03-05 10:53:16 +00:00
parent 927d13de71
commit bed25690ac

View File

@ -1293,22 +1293,21 @@ function canonizeUrl(aTriggeringEvent)
var url = gURLBar.value;
// Prevent suffix when already exists www , http , /
if (url.match(/^(www|http)|\/\s*$/i))
return;
if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
// Tack http://www. and .org on.
url = "http://www." + url + ".org/";
else if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey)
// Tack www. and .com on.
url = "http://www." + url + ".com/";
else if (aTriggeringEvent && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
// Tack www. and .org on.
url = "http://www." + url + ".net/";
if (!/^(www|http)|\/\s*$/i.test(url)) {
if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
// Tack http://www. and .org on.
url = "http://www." + url + ".org/";
else if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey)
// Tack www. and .com on.
url = "http://www." + url + ".com/";
else if (aTriggeringEvent && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
// Tack www. and .org on.
url = "http://www." + url + ".net/";
}
gURLBar.value = getShortcutOrURI(url);
}