[mw.util.tooltipAccessKeyPrefix] alt-shift for Chrome on Windows

* Fixes:
-- (bug 29753) mw.util.tooltipAccessKeyPrefix should be alt-shift for Chrome on Windows

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 52bd207..7e293de 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -258,6 +258,7 @@ production.
 * (bug 34600) Older skins using useHeadElement=false were broken in 1.18.
 * (bug 34604) [mw.config] wgActionPaths should be an object instead of a numeral
   array.
+* (bug 29753) mw.util.tooltipAccessKeyPrefix should be alt-shift for Chrome on Windows
 
 === API changes in 1.19 ===
 * Made action=edit less likely to return "unknownerror", by returning the actual error

diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 6edbe5d..eade86b 100644 (file)
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -29,9 +29,17 @@
 
                        // Chrome on any platform
                        } else if ( profile.name === 'chrome' ) {
-                               // Chrome on Mac or Chrome on other platform ?
-                               util.tooltipAccessKeyPrefix = ( profile.platform === 'mac'
-                                       ? 'ctrl-option-' : 'alt-' );
+                               
+                               util.tooltipAccessKeyPrefix = (
+                                       // Chrome on Mac
+                                       profile.platform === 'mac' ? 'ctrl-option-' :
+                                       // Chrome on Windows
+                                       // (both alt- and alt-shift work, but alt-f triggers Chrome wrench menu
+                                       // which alt-shift-f does not)
+                                       profile.platform === 'win' ? 'alt-shift-' :
+                                       // Chrome on Ubuntu (and other?)
+                                       'alt-'
+                               );
 
                        // Non-Windows Safari with webkit_version > 526
                        } else if ( profile.platform !== 'win'