* (bug 7636) Fix accesskey display for Firefox 2 on X11.

* Switch around "Shift-Alt" to "Alt-Shift", which seems more common and generally sounds better.
* Condense and correct RELEASE-NOTES stuff about this issue (we don't need three lines about one bug just because it was fixed in three phases, right?)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eb9e989..4ca8180 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -66,7 +66,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6276) Stopped search field from getting too large in Cologne Blue
 * (bug 7644) User creations that are aborted by hooks shouldn't be counted
   against account creations per day limit
-* (bug 7636) Show Firefox 2 users "shift-alt" as accesskey prefix
+* (bug 7636) Show Firefox 2 users correct accesskey prefix
 * (bug 6427) Block blocked IPs from using the mail password function
   to allow blocking of flooders
 * Include common.css from classic-style skins in main HTML with the bump URL
@@ -80,7 +80,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   strings to allow better localisation via Special:Allmessages. Mark this new
   messages as optional for localisation.
 * Fix user_newpass upgrade for prefixed tables (reported by Fyren)
-* (bug 7636) Fix typo in Firefox 2 check (tested by Werdna)
 * (bug 7663) Include language variant switcher links on Nostalgia skin
 * (bug 6531) Fix PHP fatal error on installation page with bad username input.
 * (bug 6977) Remove 404 link for autogenerated database documentation.

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 4f00294..bf08c90 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -5,7 +5,9 @@ var is_gecko = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')=
                 && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0')==-1));
 var is_safari = ((clientPC.indexOf('applewebkit')!=-1) && (clientPC.indexOf('spoofer')==-1));
 var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
-var is_ff2 = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1); // For accesskeys
+// For accesskeys
+var is_ff2_win = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1) && clientPC.indexOf('windows')!=-1;
+var is_ff2_x11 = (clientPC.indexOf('firefox/2')!=-1 || clientPC.indexOf('minefield/3')!=-1) && clientPC.indexOf('x11')!=-1;
 if (clientPC.indexOf('opera') != -1) {
        var is_opera = true;
        var is_opera_preseven = (window.opera && !document.childNodes);
@@ -468,8 +470,10 @@ function akeytt() {
                pref = 'control-';
        else if (is_opera)
                pref = 'shift-esc-';
-       else if (is_ff2)
-               pref = 'shift-alt-';
+       else if (is_ff2_x11)
+               pref = 'ctrl-shift-';
+       else if (is_ff2_win)
+               pref = 'alt-shift-';
        else
                pref = 'alt-';