Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/213600
Change subject: Remove unused parameter lang from $.wikiEditor.auto* functions
......................................................................
Remove unused parameter lang from $.wikiEditor.auto* functions
Change-Id: I71680155b668b6e87be909d2b765f9cbed064bbf
---
M modules/jquery.wikiEditor.js
1 file changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/00/213600/1
diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js
index 7c8e4c3..a96b7fa 100644
--- a/modules/jquery.wikiEditor.js
+++ b/modules/jquery.wikiEditor.js
@@ -165,11 +165,10 @@
* with a default.
*
* @param object Object to extract property from
- * @param lang Language code, defaults to wgUserLanguage
*/
- autoLang: function ( object, lang ) {
- var defaultKey = $( 'body' ).hasClass( 'rtl' ) ? 'default-rtl'
: 'default';
- lang = lang || mw.config.get( 'wgUserLanguage' );
+ autoLang: function ( object ) {
+ var defaultKey = $( 'body' ).hasClass( 'rtl' ) ? 'default-rtl'
: 'default',
+ lang = mw.config.get( 'wgUserLanguage' );
return hasOwn.call( object, lang ) ? object[lang] : (
object[defaultKey] || object['default'] || object );
},
@@ -179,10 +178,9 @@
*
* @param icon Icon object from e.g. toolbar config
* @param path Default icon path, defaults to $.wikiEditor.imgPath
- * @param lang Language code, defaults to wgUserLanguage
*/
- autoIcon: function ( icon, path, lang ) {
- var src = $.wikiEditor.autoLang( icon, lang );
+ autoIcon: function ( icon, path ) {
+ var src = $.wikiEditor.autoLang( icon );
path = path || $.wikiEditor.imgPath;
// Prepend path if src is not absolute
if ( src.substr( 0, 7 ) !== 'http://' && src.substr( 0, 8 ) !==
'https://' && src[0] !== '/' ) {
@@ -197,16 +195,15 @@
* @param icon Icon object, see autoIcon()
* @param offset Offset object
* @param path Icon path, see autoIcon()
- * @param lang Language code, defaults to wgUserLanguage
*/
- autoIconOrOffset: function ( icon, offset, path, lang ) {
- lang = lang || mw.config.get( 'wgUserLanguage' );
+ autoIconOrOffset: function ( icon, offset, path ) {
+ var lang = mw.config.get( 'wgUserLanguage' );
if ( typeof offset === 'object' && hasOwn.call( offset, lang )
) {
return offset[lang];
} else if ( typeof icon === 'object' && hasOwn.call( icon, lang
) ) {
- return $.wikiEditor.autoIcon( icon, undefined, lang );
+ return $.wikiEditor.autoIcon( icon );
} else {
- return $.wikiEditor.autoLang( offset, lang );
+ return $.wikiEditor.autoLang( offset );
}
}
};
--
To view, visit https://gerrit.wikimedia.org/r/213600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71680155b668b6e87be909d2b765f9cbed064bbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits