From: Bartosz DziewoƄski Date: Wed, 9 Aug 2017 22:10:34 +0000 (+0200) Subject: Fix 'logName' parameter (5th) in many uses of mw.log.deprecate X-Git-Tag: 1.31.0-rc.0~2405^2 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=4e84a8878f513360b5658c908e8ae1316828e6b2;p=lhc%2Fweb%2Fwiklou.git Fix 'logName' parameter (5th) in many uses of mw.log.deprecate It's apparently supposed to contains the full name of the deprecated property/function and apparently almost no one ever remembers it. This fixes error messages like "Use of "wikiGetlink" is deprecated" to instead read "Use of "mw.util.wikiGetlink" is deprecated", and apparently improves some error logging detais. Change-Id: I9b0d6761754e5844d51b71535e0547205eb20781 --- diff --git a/resources/src/jquery/jquery.mwExtension.js b/resources/src/jquery/jquery.mwExtension.js index 4bcccdd5e6..9d970ed274 100644 --- a/resources/src/jquery/jquery.mwExtension.js +++ b/resources/src/jquery/jquery.mwExtension.js @@ -118,11 +118,11 @@ return true; } }, function ( key, value ) { - mw.log.deprecate( $, key, value ); + mw.log.deprecate( $, key, value, null, '$.' + key ); } ); mw.log.deprecate( $, 'escapeRE', function ( str ) { return str.replace( /([\\{}()|.?*+\-^$\[\]])/g, '\\$1' ); // eslint-disable-line no-useless-escape - }, 'Use mediawiki.RegExp instead.' ); + }, 'Use mediawiki.RegExp instead.', '$.escapeRE' ); }( jQuery, mediaWiki ) ); diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.legacy/wikibits.js index 6eccc050a0..bd1b9188be 100644 --- a/resources/src/mediawiki.legacy/wikibits.js +++ b/resources/src/mediawiki.legacy/wikibits.js @@ -99,7 +99,7 @@ $.each( [ 'write', 'writeln' ], function ( idx, method ) { mw.log.deprecate( document, method, function () { $( 'body' ).append( $.parseHTML( Array.prototype.join.call( arguments, '' ) ) ); - }, 'Use jQuery or mw.loader.load instead.' ); + }, 'Use jQuery or mw.loader.load instead.', 'document.' + method ); } ); }( mediaWiki, jQuery ) ); diff --git a/resources/src/mediawiki.toolbar/toolbar.js b/resources/src/mediawiki.toolbar/toolbar.js index 9ee499c096..d55ed80ca3 100644 --- a/resources/src/mediawiki.toolbar/toolbar.js +++ b/resources/src/mediawiki.toolbar/toolbar.js @@ -168,7 +168,7 @@ // Expose API publicly // @deprecated since MW 1.29 - mw.log.deprecate( mw, 'toolbar', toolbar ); + mw.log.deprecate( mw, 'toolbar', toolbar, null, 'mw.toolbar' ); $( function () { var i, button; diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js index 0e423beecf..34f7eba473 100644 --- a/resources/src/mediawiki/mediawiki.util.js +++ b/resources/src/mediawiki/mediawiki.util.js @@ -550,7 +550,7 @@ * @inheritdoc #getUrl * @deprecated since 1.23 Use #getUrl instead. */ - mw.log.deprecate( util, 'wikiGetlink', util.getUrl, 'Use mw.util.getUrl instead.' ); + mw.log.deprecate( util, 'wikiGetlink', util.getUrl, 'Use mw.util.getUrl instead.', 'mw.util.wikiGetlink' ); /** * Add the appropriate prefix to the accesskey shown in the tooltip. @@ -570,7 +570,7 @@ } $nodes.updateTooltipAccessKeys(); - }, 'Use jquery.accessKeyLabel instead.' ); + }, 'Use jquery.accessKeyLabel instead.', 'mw.util.updateTooltipAccessKeys' ); /** * Add a little box at the top of the screen to inform the user of @@ -591,7 +591,7 @@ } mw.notify( message, { autoHide: true, tag: 'legacy' } ); return true; - }, 'Use mw.notify instead.' ); + }, 'Use mw.notify instead.', 'mw.util.jsMessage' ); /** * Encode the string like Sanitizer::escapeId() in PHP @@ -603,7 +603,7 @@ */ mw.log.deprecate( util, 'escapeId', function ( str ) { return escapeIdInternal( str, 'legacy' ); - }, 'Use mw.util.escapeIdForAttribute or mw.util.escapeIdForLink instead.' ); + }, 'Use mw.util.escapeIdForAttribute or mw.util.escapeIdForLink instead.', 'mw.util.escapeId' ); /** * Initialisation of mw.util.$content