From d99227e1c398e6c42d2dff2d1292dfc6f1b521e6 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Sun, 21 Jan 2018 20:10:42 +0100 Subject: [PATCH] Use ES5 String.prototype.trim() instead of jQuery.trim() Replace: * $.trim( str ) by str.trim() Ensure that str is a string before calling str.trim(). Change-Id: I48f08fdac1e7d802813563c4691e9bbaf2c78336 --- resources/src/jquery/jquery.colorUtil.js | 5 ++++- resources/src/jquery/jquery.tablesorter.js | 10 +++++----- .../src/mediawiki.special/mediawiki.special.block.js | 2 +- .../mediawiki.special.changecredentials.js | 2 +- .../mediawiki.special.userlogin.signup.js | 2 +- .../mw.widgets.CategoryMultiselectWidget.js | 2 +- resources/src/mediawiki/htmlform/multiselect.js | 2 +- resources/src/mediawiki/mediawiki.Title.js | 6 +++--- resources/src/mediawiki/mediawiki.jqueryMsg.js | 2 +- resources/src/mediawiki/mediawiki.template.js | 2 +- 10 files changed, 19 insertions(+), 16 deletions(-) diff --git a/resources/src/jquery/jquery.colorUtil.js b/resources/src/jquery/jquery.colorUtil.js index a5b136d969..d46d009909 100644 --- a/resources/src/jquery/jquery.colorUtil.js +++ b/resources/src/jquery/jquery.colorUtil.js @@ -29,6 +29,9 @@ if ( color && Array.isArray( color ) && color.length === 3 ) { return color; } + if ( typeof color !== 'string' ) { + return undefined; + } // Look for rgb(num,num,num) // eslint-disable-next-line no-cond-assign @@ -77,7 +80,7 @@ } // Otherwise, we're most likely dealing with a named color - return $.colorUtil.colors[ $.trim( color ).toLowerCase() ]; + return $.colorUtil.colors[ color.trim().toLowerCase() ]; }, /** diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index 6d67ade978..5ca866eff8 100644 --- a/resources/src/jquery/jquery.tablesorter.js +++ b/resources/src/jquery/jquery.tablesorter.js @@ -105,7 +105,7 @@ if ( rowIndex !== lastRowIndex ) { lastRowIndex = rowIndex; cellIndex = $( rows[ rowIndex ] ).data( 'columnToCell' )[ column ]; - nodeValue = $.trim( getElementSortKey( rows[ rowIndex ].cells[ cellIndex ] ) ); + nodeValue = getElementSortKey( rows[ rowIndex ].cells[ cellIndex ] ).trim(); } } else { nodeValue = ''; @@ -1090,7 +1090,7 @@ }, format: function ( s ) { var tsc; - s = $.trim( s.toLowerCase() ); + s = s.toLowerCase().trim(); if ( ts.collationRegex ) { tsc = ts.collationTable; s = s.replace( ts.collationRegex, function ( match ) { @@ -1144,7 +1144,7 @@ return ts.rgx.url[ 0 ].test( s ); }, format: function ( s ) { - return $.trim( s.replace( ts.rgx.url[ 1 ], '' ) ); + return s.replace( ts.rgx.url[ 1 ], '' ).trim(); }, type: 'text' } ); @@ -1207,7 +1207,7 @@ }, format: function ( s ) { var match, y; - s = $.trim( s.toLowerCase() ); + s = s.toLowerCase().trim(); if ( ( match = s.match( ts.dateRegex[ 0 ] ) ) !== null ) { if ( mw.config.get( 'wgDefaultDateFormat' ) === 'mdy' || mw.config.get( 'wgPageContentLanguage' ) === 'en' ) { @@ -1266,7 +1266,7 @@ ts.addParser( { id: 'number', is: function ( s ) { - return $.tablesorter.numberRegex.test( $.trim( s ) ); + return $.tablesorter.numberRegex.test( s.trim() ); }, format: function ( s ) { return $.tablesorter.formatDigit( s ); diff --git a/resources/src/mediawiki.special/mediawiki.special.block.js b/resources/src/mediawiki.special/mediawiki.special.block.js index 49e471efb9..ba9319510d 100644 --- a/resources/src/mediawiki.special/mediawiki.special.block.js +++ b/resources/src/mediawiki.special/mediawiki.special.block.js @@ -23,7 +23,7 @@ expiryWidget = infuseOrNull( 'mw-input-wpExpiry' ); function updateBlockOptions() { - var blocktarget = $.trim( blockTargetWidget.getValue() ), + var blocktarget = blockTargetWidget.getValue().trim(), isEmpty = blocktarget === '', isIp = mw.util.isIPAddress( blocktarget, true ), isIpRange = isIp && blocktarget.match( /\/\d+$/ ), diff --git a/resources/src/mediawiki.special/mediawiki.special.changecredentials.js b/resources/src/mediawiki.special/mediawiki.special.changecredentials.js index 959287991d..ad8a4f4f06 100644 --- a/resources/src/mediawiki.special/mediawiki.special.changecredentials.js +++ b/resources/src/mediawiki.special/mediawiki.special.changecredentials.js @@ -17,7 +17,7 @@ currentApiPromise = undefined; } - password = $.trim( password ); + password = password.trim(); if ( password === '' ) { self.setErrors( [] ); diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js index 10e19e722f..8a61afbe6a 100644 --- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js +++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js @@ -82,7 +82,7 @@ var apiPromise, d = $.Deferred(); - if ( $.trim( $usernameInput.val() ) === '' ) { + if ( $usernameInput.val().trim() === '' ) { d.resolve( { valid: true, messages: [] } ); return d.promise(); } diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js index d14a47abc5..c673eb21c2 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js @@ -138,7 +138,7 @@ promises = [], deferred = $.Deferred(); - if ( $.trim( input ) === '' ) { + if ( input.trim() === '' ) { deferred.resolve( [] ); return deferred.promise(); } diff --git a/resources/src/mediawiki/htmlform/multiselect.js b/resources/src/mediawiki/htmlform/multiselect.js index d295ca72d5..8a44251ccd 100644 --- a/resources/src/mediawiki/htmlform/multiselect.js +++ b/resources/src/mediawiki/htmlform/multiselect.js @@ -9,7 +9,7 @@ oldClass = ( ' ' + $oldContainer.attr( 'class' ) + ' ' ).replace( /(mw-htmlform-field-HTMLMultiSelectField|mw-chosen|mw-htmlform-dropdown)/g, '' ), $select = $( '