| Index: trunk/phase3/skins/common/wikibits.js |
| — | — | @@ -5,7 +5,9 @@ |
| 6 | 6 | && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0')==-1)); |
| 7 | 7 | var is_safari = ((clientPC.indexOf('applewebkit')!=-1) && (clientPC.indexOf('spoofer')==-1)); |
| 8 | 8 | var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); |
| 9 | | -var is_ff2 = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1); // For accesskeys |
| | 9 | +// For accesskeys |
| | 10 | +var is_ff2_win = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1) && clientPC.indexOf('windows')!=-1; |
| | 11 | +var is_ff2_x11 = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1) && clientPC.indexOf('x11')!=-1; |
| 10 | 12 | if (clientPC.indexOf('opera') != -1) { |
| 11 | 13 | var is_opera = true; |
| 12 | 14 | var is_opera_preseven = (window.opera && !document.childNodes); |
| — | — | @@ -468,8 +470,10 @@ |
| 469 | 471 | pref = 'control-'; |
| 470 | 472 | else if (is_opera) |
| 471 | 473 | pref = 'shift-esc-'; |
| 472 | | - else if (is_ff2) |
| 473 | | - pref = 'shift-alt-'; |
| | 474 | + else if (is_ff2_x11) |
| | 475 | + pref = 'ctrl-shift-'; |
| | 476 | + else if (is_ff2_win) |
| | 477 | + pref = 'alt-shift-'; |
| 474 | 478 | else |
| 475 | 479 | pref = 'alt-'; |
| 476 | 480 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | * (bug 6276) Stopped search field from getting too large in Cologne Blue |
| 68 | 68 | * (bug 7644) User creations that are aborted by hooks shouldn't be counted |
| 69 | 69 | against account creations per day limit |
| 70 | | -* (bug 7636) Show Firefox 2 users "shift-alt" as accesskey prefix |
| | 70 | +* (bug 7636) Show Firefox 2 users correct accesskey prefix |
| 71 | 71 | * (bug 6427) Block blocked IPs from using the mail password function |
| 72 | 72 | to allow blocking of flooders |
| 73 | 73 | * Include common.css from classic-style skins in main HTML with the bump URL |
| — | — | @@ -80,7 +80,6 @@ |
| 81 | 81 | strings to allow better localisation via Special:Allmessages. Mark this new |
| 82 | 82 | messages as optional for localisation. |
| 83 | 83 | * Fix user_newpass upgrade for prefixed tables (reported by Fyren) |
| 84 | | -* (bug 7636) Fix typo in Firefox 2 check (tested by Werdna) |
| 85 | 84 | * (bug 7663) Include language variant switcher links on Nostalgia skin |
| 86 | 85 | * (bug 6531) Fix PHP fatal error on installation page with bad username input. |
| 87 | 86 | * (bug 6977) Remove 404 link for autogenerated database documentation. |