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

diff --git a/resources/src/jquery/jquery.colorUtil.js b/resources/src/jquery/jquery.colorUtil.js
index a5b136d..d46d009 100644 (file)
--- 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 6d67ade..5ca866e 100644 (file)
--- 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 49e471e..ba93195 100644 (file)
--- 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 9592879..ad8a4f4 100644 (file)
--- 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 10e19e7..8a61afb 100644 (file)
--- 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 d14a47a..c673eb2 100644 (file)
--- 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 d295ca7..8a44251 100644 (file)
--- 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 = $( '<select>' ),
                        dataPlaceholder = mw.message( 'htmlform-chosen-placeholder' );
-               oldClass = $.trim( oldClass );
+               oldClass = oldClass.trim();
                $select.attr( {
                        name: name,
                        multiple: 'multiple',

diff --git a/resources/src/mediawiki/mediawiki.Title.js b/resources/src/mediawiki/mediawiki.Title.js
index 53cbd60..9db2771 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -537,7 +537,7 @@
                namespace = defaultNamespace === undefined ? NS_MAIN : defaultNamespace;
 
                // Normalise additional whitespace
-               title = $.trim( title.replace( /\s/g, ' ' ) );
+               title = title.replace( /\s/g, ' ' ).trim();
 
                // Process initial colon
                if ( title !== '' && title[ 0 ] === ':' ) {
@@ -579,7 +579,7 @@
                                ext = parts.pop();
 
                                // Remove whitespace of the name part (that W/O extension)
-                               title = $.trim( parts.join( '.' ) );
+                               title = parts.join( '.' ).trim();
 
                                // Cut, if too long and append file extension
                                title = trimFileNameToByteLength( title, ext );
@@ -587,7 +587,7 @@
                        } else {
 
                                // Missing file extension
-                               title = $.trim( parts.join( '.' ) );
+                               title = parts.join( '.' ).trim();
 
                                // Name has no file extension and a fallback wasn't provided either
                                return null;

diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index 8b25a0b..ea91afe 100644 (file)
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -1272,7 +1272,7 @@
                 * @return {string} Localized namespace name
                 */
                ns: function ( nodes ) {
-                       var ns = $.trim( textify( nodes[ 0 ] ) );
+                       var ns = textify( nodes[ 0 ] ).trim();
                        if ( !/^\d+$/.test( ns ) ) {
                                ns = mw.config.get( 'wgNamespaceIds' )[ ns.replace( / /g, '_' ).toLowerCase() ];
                        }

diff --git a/resources/src/mediawiki/mediawiki.template.js b/resources/src/mediawiki/mediawiki.template.js
index 5e0e343..4a3157c 100644 (file)
--- a/resources/src/mediawiki/mediawiki.template.js
+++ b/resources/src/mediawiki/mediawiki.template.js
@@ -115,7 +115,7 @@
                compile: function ( src ) {
                        return {
                                render: function () {
-                                       return $( $.parseHTML( $.trim( src ) ) );
+                                       return $( $.parseHTML( src.trim() ) );
                                }
                        };
                }