Merge "language: Move some language-related classes to includes/language/"

[lhc/web/wiklou.git] / resources / src / mediawiki.widgets.datetime / DateTimeFormatter.js

diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
index e8c1b9b..81cf433 100644 (file)
--- a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
@@ -333,7 +333,7 @@
                                                        parseValue: this.parseSpecValue
                                                };
                                                spec.size = Math.max.apply(
-                                                       // eslint-disable-next-line jquery/no-map-util
+                                                       // eslint-disable-next-line no-jquery/no-map-util
                                                        null, $.map( spec.values, function ( v ) { return v.length; } )
                                                );
                                                return spec;
@@ -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 ] ) ) {