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 4350737..9202d2e 100644 (file)
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -2,7 +2,7 @@
  * Implements mediaWiki.util library
  */
 ( function ( $, mw ) {
-"use strict";
+       "use strict";
 
        // Local cache and alias
        var util = {
@@ -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'
@@ -121,25 +131,26 @@
                 * @param str string String to be encoded
                 */
                wikiUrlencode: function ( str ) {
-                       return this.rawurlencode( str )
+                       return util.rawurlencode( str )
                                .replace( /%20/g, '_' ).replace( /%3A/g, ':' ).replace( /%2F/g, '/' );
                },
 
                /**
                 * Get the link to a page name (relative to wgServer)
                 *
-                * @param str string Page name to get the link for.
-                * @return string Location for a page with name of 'str' or boolean false on error.
+                * @param str String: Page name to get the link for.
+                * @return String: Location for a page with name of 'str' or boolean false on error.
                 */
                wikiGetlink: function ( str ) {
                        return mw.config.get( 'wgArticlePath' ).replace( '$1',
-                               this.wikiUrlencode( str || mw.config.get( 'wgPageName' ) ) );
+                               util.wikiUrlencode( typeof str === 'string' ? str : mw.config.get( 'wgPageName' ) ) );
                },
 
                /**
                 * 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' )
                 */
@@ -149,23 +160,24 @@
                },
 
                /**
-                * Append a new style block to the head
+                * Append a new style block to the head and return the CSSStyleSheet object.
+                * Use .ownerNode to access the <style> element, or use mw.loader.addStyleTag.
+                * This function returns the styleSheet object for convience (due to cross-browsers
+                * difference as to where it is located).
+                * @example
+                * <code>
+                * var sheet = mw.util.addCSS('.foobar { display: none; }');
+                * $(foo).click(function () {
+                *     // Toggle the sheet on and off
+                *     sheet.disabled = !sheet.disabled;
+                * });
+                * </code>
                 *
                 * @param text string CSS to be appended
-                * @return CSSStyleSheet
+                * @return CSSStyleSheet (use .ownerNode to get to the <style> element)
                 */
                addCSS: function ( text ) {
-                       var s = document.createElement( 'style' );
-                       s.type = 'text/css';
-                       s.rel = 'stylesheet';
-                       // Insert into document before setting cssText (bug 33305)
-                       document.getElementsByTagName('head')[0].appendChild( s );
-                       if ( s.styleSheet ) {
-                               s.styleSheet.cssText = text; // IE
-                       } else {
-                               // Safari sometimes borks on null
-                               s.appendChild( document.createTextNode( String( text ) ) );
-                       }
+                       var s = mw.loader.addStyleTag( text );
                        return s.sheet || s;
                },
 
@@ -221,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' ) );
@@ -384,7 +396,7 @@
                                        $link.attr( 'title', tooltip );
                                }
                                if ( accesskey && tooltip ) {
-                                       this.updateTooltipAccessKeys( $link );
+                                       util.updateTooltipAccessKeys( $link );
                                }
 
                                // Where to put our node ?