From 47a1f144099922f73224a5f912642bb270f321ac Mon Sep 17 00:00:00 2001 From: Fomafix Date: Thu, 28 Feb 2019 09:49:33 +0100 Subject: [PATCH] DateTimeFormatter: Use mw.RegExp.escape from 'mediawiki.RegExp' Change-Id: I7aa0264f58d7f79fd80da2a3bb37caa767d78474 --- resources/Resources.php | 1 + resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/Resources.php b/resources/Resources.php index 1edfdd3eb7..723c1a5a47 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2672,6 +2672,7 @@ return [ 'period-pm', ], 'dependencies' => [ + 'mediawiki.RegExp', 'oojs-ui-core', 'oojs-ui.styles.icons-moderation', 'oojs-ui.styles.icons-movement', diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js index 3bfeb8dc6b..81cf433f38 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js @@ -415,7 +415,7 @@ // eslint-disable-next-line no-restricted-properties v = v.normalize(); } - re = new RegExp( '^\\s*' + v.replace( /([\\{}()|.?*+\-^$\[\]])/g, '\\$1' ), 'i' ); // eslint-disable-line no-useless-escape + re = new RegExp( '^\\s*' + mw.RegExp.escape( v ), 'i' ); for ( k in this.values ) { k = +k; if ( !isNaN( k ) && re.test( this.values[ k ] ) ) { -- 2.20.1