Merge "Use canonical parser option for linkupdate in api purge"

[lhc/web/wiklou.git] / resources / mediawiki / mediawiki.util.js

diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 6edbe5d..9202d2e 100644 (file)
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -29,9 +29,19 @@
 
                        // 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 = (
+                                       profile.platform === 'mac'
+                                               // Chrome on Mac
+                                               ? 'ctrl-option-'
+                                               : profile.platform === 'win'
+                                                       // Chrome on Windows
+                                                       // (both alt- and alt-shift work, but alt-f triggers Chrome wrench menu
+                                                       // which alt-shift-f does not)
+                                                       ? 'alt-shift-'
+                                                       // Chrome on other (Ubuntu?)
+                                                       : 'alt-'
+                               );
 
                        // Non-Windows Safari with webkit_version > 526
                        } else if ( profile.platform !== 'win'
@@ -140,6 +150,7 @@
                 * Get address to a script in the wiki root.
                 * For index.php use mw.config.get( 'wgScript' )
                 *
+                * @since 1.18
                 * @param str string Name of script (eg. 'api'), defaults to 'index'
                 * @return string Address to script (eg. '/w/api.php' )
                 */
@@ -222,7 +233,7 @@
                        // Get last match, stop at hash
                        var     re = new RegExp( '^[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' ),
                                m = re.exec( url );
-                       if ( m && m.length > 1 ) {
+                       if ( m ) {
                                // Beware that decodeURIComponent is not required to understand '+'
                                // by spec, as encodeURIComponent does not produce it.
                                return decodeURIComponent( m[1].replace( /\+/g, '%20' ) );