* Brion says Opera Mac uses Shift-Esc-, not Ctrl-

* Show "Ctrl-", not "Control-", for standardization

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 183ed5f..1b4335b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -49,6 +49,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   permissions, just as before.
 * (bug 8567) Added hook RawPageViewBeforeOutput just before the text is blown out in action=raw,
              so extensions might influence the output.
+* Correct tooltip accesskey hint for Opera on the Macintosh (it uses Shift-Esc-, not Ctrl-).
 
 == Languages updated ==
 

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 9722278..fbfd28b 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -484,11 +484,11 @@ function akeytt( doId ) {
        var pref;
        var ta = window.ta;  // make local copy
        if (!ta) ta = new Array;
-       if (is_safari || navigator.userAgent.toLowerCase().indexOf('mac') + 1
-               || navigator.userAgent.toLowerCase().indexOf('konqueror') + 1 ) {
-               pref = 'control-';
-       } else if (is_opera) {
+       if (is_opera) {
                pref = 'shift-esc-';
+       } else if (is_safari || navigator.userAgent.toLowerCase().indexOf('mac') != -1
+               || navigator.userAgent.toLowerCase().indexOf('konqueror') != -1 ) {
+               pref = 'ctrl-';
        } else if (is_ff2_x11) {
                pref = 'ctrl-shift-';
        } else if (is_ff2_win) {