Merge "DateTimeFormatter: Use mw.RegExp.escape from 'mediawiki.RegExp'"

diff --git a/resources/Resources.php b/resources/Resources.php
index ec3a5ba..65e6855 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2673,6 +2673,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 3bfeb8d..81cf433 100644 (file)
--- 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 ] ) ) {