Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 220589 - [Mac] Command-Enter and Command-Shift-Enter (in the location bar) should work like windows/linux builds. r=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@168879 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com 2005-02-06 19:53:10 +00:00
parent 59155e4e13
commit d461a89b64
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/browser/base/content/browser.js
View File

@ -1906,16 +1906,22 @@ function canonizeUrl(aTriggeringEvent, aPostDataRef)
var url = gURLBar.value;
// Prevent suffix when already exists www , http , /
if (!/^(www|http)|\/\s*$/i.test(url)) {
if (!/^(www|http)|\/\s*$/i.test(url) && aTriggeringEvent) {
var suffix = null;
#ifdef XP_MACOSX
var accelPressed = 'metaKey' in aTriggeringEvent &&
aTriggeringEvent.metaKey;
#else
var accelPressed = 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey;
#endif
var shiftPressed = 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey;
if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
if (accelPressed && shiftPressed)
suffix = ".org/";
else if (aTriggeringEvent && 'ctrlKey' in aTriggeringEvent &&
aTriggeringEvent.ctrlKey)
else if (accelPressed)
{
try {
suffix = gPrefService.getCharPref("browser.fixup.alternate.suffix");
@ -1927,8 +1933,7 @@ function canonizeUrl(aTriggeringEvent, aPostDataRef)
}
}
else if (aTriggeringEvent && 'shiftKey' in aTriggeringEvent &&
aTriggeringEvent.shiftKey)
else if (shiftPressed)
suffix = ".net/";
if (suffix != null) {