jenkins-bot has submitted this change and it was merged.
Change subject: Remove duplicate definition of mw.mergeConfig
......................................................................
Remove duplicate definition of mw.mergeConfig
- 1 seems more than enough...
- Fixed values != string or object
Change-Id: Ia6dce753b867734bf4062f5e399e35ede8f7d33f
---
M MwEmbedModules/MwEmbedSupport/mw.MwEmbedSupport.js
1 file changed, 11 insertions(+), 17 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MwEmbedModules/MwEmbedSupport/mw.MwEmbedSupport.js
b/MwEmbedModules/MwEmbedSupport/mw.MwEmbedSupport.js
index 36ed5fc..3303a16 100644
--- a/MwEmbedModules/MwEmbedSupport/mw.MwEmbedSupport.js
+++ b/MwEmbedModules/MwEmbedSupport/mw.MwEmbedSupport.js
@@ -43,12 +43,6 @@
mediaWiki.config.set( name, value );
}
};
- mw.mergeConfig = function( name, value ){
- if( mediaWiki.config.get( name ) != null ){
- var value = $.extend( {}, mediaWiki.config.get( name ),
value );
- }
- return mw.setConfig( name, value );
- };
/**
* Set any pre-mwEmbed embed configuration
*/
@@ -89,28 +83,28 @@
/**
* Merge in a configuration value:
*/
- mw.mergeConfig = function( name, value ){
- if( typeof name == 'object' ) {
- $.each( name, function( inx, val) {
+ mw.mergeConfig = function ( name, value ) {
+ if ( typeof name === 'object' ) {
+ $.each( name, function ( inx, val) {
mw.mergeConfig( inx, val );
- });
- return ;
+ } );
+ return;
}
var existingValue = mediaWiki.config.get( name );
- if( !existingValue || typeof existingValue == 'string'){
+ if ( !existingValue || typeof existingValue !== 'object' ){
mw.setConfig( name, value );
return ;
}
- if( typeof mediaWiki.config.get( name ) == 'object' ){
- if( $.isArray( existingValue) && $.isArray( value ) ){
- for( var i =0; i < value.length ; i ++ ){
+ if ( typeof existingValue === 'object' ){
+ if( $.isArray( existingValue) && $.isArray( value ) ) {
+ for( var i =0; i < value.length ; i ++ ) {
existingValue.push( value[i] );
}
mw.setConfig( name, $.uniqueArray(
existingValue ) );
} else {
- mw.setConfig( name, $.extend( {},
existingValue, value) );
+ mw.setConfig( name, $.extend( {},
existingValue, value ) );
}
- return ;
+ return;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/241525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6dce753b867734bf4062f5e399e35ede8f7d33f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MwEmbedSupport
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
