From 9e002ecb551aaa41ed9bb474598ffc1c1953a1dc Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Mon, 1 May 2017 14:56:04 +0100 Subject: [PATCH] Spread and indent string-concatenations Avoids single lint string concatenations and multi-line strings. Change-Id: Iada91c1019cda87d48b13bdcff963d1950b54874 --- resources/src/jquery/jquery.tablesorter.js | 25 ++++++++--- resources/src/mediawiki/mediawiki.util.js | 24 +++++++--- .../resources/jquery/jquery.byteLimit.test.js | 2 +- .../mediawiki/mediawiki.Title.test.js | 2 +- .../mediawiki/mediawiki.util.test.js | 44 +++++++++---------- 5 files changed, 62 insertions(+), 35 deletions(-) diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index f84c091dba..8d019e568c 100644 --- a/resources/src/jquery/jquery.tablesorter.js +++ b/resources/src/jquery/jquery.tablesorter.js @@ -509,9 +509,14 @@ // We allow a trailing percent sign, which we just strip. This works fine // if percents and regular numbers aren't being mixed. - ts.numberRegex = new RegExp( '^(' + '[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?' + // Fortran-style scientific - '|' + '[-+\u2212]?' + digitClass + '+[\\s\\xa0]*%?' + // Generic localised - ')$', 'i' ); + ts.numberRegex = new RegExp( + '^(' + + '[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?' + // Fortran-style scientific + '|' + + '[-+\u2212]?' + digitClass + '+[\\s\\xa0]*%?' + // Generic localised + ')$', + 'i' + ); } function buildDateTable() { @@ -540,10 +545,20 @@ ts.dateRegex[ 0 ] = new RegExp( /^\s*(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{2,4})\s*?/i ); // Written Month name, dmy - ts.dateRegex[ 1 ] = new RegExp( '^\\s*(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' ); + ts.dateRegex[ 1 ] = new RegExp( + '^\\s*(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(' + + regex + + ')' + + '[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', + 'i' + ); // Written Month name, mdy - ts.dateRegex[ 2 ] = new RegExp( '^\\s*(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' ); + ts.dateRegex[ 2 ] = new RegExp( + '^\\s*(' + regex + ')' + + '[\\,\\.\\-\\/\'\\s]+(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', + 'i' + ); } diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js index 67e2ebb7bf..a9c0942b37 100644 --- a/resources/src/mediawiki/mediawiki.util.js +++ b/resources/src/mediawiki/mediawiki.util.js @@ -470,11 +470,19 @@ block = allowBlock ? '(?:\\/(?:12[0-8]|1[01][0-9]|[1-9]?\\d))?' : ''; RE_IPV6_ADD = '(?:' + // starts with "::" (including "::") - ':(?::|(?::' + '[0-9A-Fa-f]{1,4}' + '){1,7})' + - '|' + // ends with "::" (except "::") - '[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' + '){0,6}::' + - '|' + // contains no "::" - '[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' + '){7}' + + ':(?::|(?::' + + '[0-9A-Fa-f]{1,4}' + + '){1,7})' + + '|' + // ends with "::" (except "::") + '[0-9A-Fa-f]{1,4}' + + '(?::' + + '[0-9A-Fa-f]{1,4}' + + '){0,6}::' + + '|' + // contains no "::" + '[0-9A-Fa-f]{1,4}' + + '(?::' + + '[0-9A-Fa-f]{1,4}' + + '){7}' + ')'; if ( new RegExp( '^' + RE_IPV6_ADD + block + '$' ).test( address ) ) { @@ -482,7 +490,11 @@ } // contains one "::" in the middle (single '::' check below) - RE_IPV6_ADD = '[0-9A-Fa-f]{1,4}' + '(?:::?' + '[0-9A-Fa-f]{1,4}' + '){1,6}'; + RE_IPV6_ADD = + '[0-9A-Fa-f]{1,4}' + + '(?:::?' + + '[0-9A-Fa-f]{1,4}' + + '){1,6}'; return ( new RegExp( '^' + RE_IPV6_ADD + block + '$' ).test( address ) && diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js index c7b7cc0d62..5c1be670c4 100644 --- a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js @@ -114,7 +114,7 @@ $input: $( '' ).attr( 'type', 'text' ) .byteLimit( 12 ), sample: mbSample, - expected: '1234567890' + '12' + expected: '123456789012' } ); byteLimitTest( { diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js index 1bc4c06d82..d6fe744fc0 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js @@ -483,7 +483,7 @@ title = mw.Title.newFromImg( { src: thisCase.url } ); if ( thisCase.nameText !== undefined ) { - prefix = '[' + thisCase.typeOfUrl + ' URL' + '] '; + prefix = '[' + thisCase.typeOfUrl + ' URL] '; assert.notStrictEqual( title, null, prefix + 'Parses successfully' ); assert.equal( title.getNameText(), thisCase.nameText, prefix + 'Filename matches original' ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js index 0e88740172..da04c8d541 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js @@ -256,28 +256,28 @@ var pTestTb, pCustom, vectorTabs, tbRL, cuQuux, $cuQuux, tbMW, $tbMW, tbRLDM, caFoo, addedAfter, tbRLDMnonexistentid, tbRLDMemptyjquery; - pTestTb = '\ -
\ -

Toolbox

\ - \ -
'; - pCustom = '\ -
\ -

Views

\ - \ -
'; - vectorTabs = '\ -
\ -

Views

\ - \ -
'; + pTestTb = + '
' + + '

Toolbox

' + + '' + + '
'; + pCustom = + '
' + + '

Views

' + + '' + + '
'; + vectorTabs = + '
' + + '

Views

' + + '' + + '
'; $( '#qunit-fixture' ).append( pTestTb, pCustom, vectorTabs ); -- 2.20.1