Merge "Fix order on Special:Contributions when timestamps are identical"

[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 d8ec5b5..e8c1b9b 100644 (file)
--- a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-properties */
 ( function () {
 
        /**
@@ -334,6 +333,7 @@
                                                        parseValue: this.parseSpecValue
                                                };
                                                spec.size = Math.max.apply(
+                                                       // eslint-disable-next-line jquery/no-map-util
                                                        null, $.map( spec.values, function ( v ) { return v.length; } )
                                                );
                                                return spec;
@@ -410,7 +410,9 @@
                        }
                }
 
+               // eslint-disable-next-line no-restricted-properties
                if ( v.normalize ) {
+                       // 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