Merge "ApiSetNotificationTimestamp: Make entirewatchlist more efficient"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / dm / mw.rcfilters.dm.SavedQueriesModel.js

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 9d8f977..adf3fbb 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-properties */
 ( function () {
        /**
         * View model for saved queries
@@ -104,6 +103,7 @@
                        //     }
                        //   }
                        // }
+                       // eslint-disable-next-line jquery/no-each-util
                        $.each( savedQueries.queries || {}, function ( id, obj ) {
                                if ( obj.data && obj.data.filters ) {
                                        obj.data = model.convertToParameters( obj.data );
@@ -115,6 +115,7 @@
                }
 
                // Initialize the query items
+               // eslint-disable-next-line jquery/no-each-util
                $.each( savedQueries.queries || {}, function ( id, obj ) {
                        var normalizedData = obj.data,
                                isDefault = String( savedQueries.default ) === String( id );
@@ -144,7 +145,7 @@
                                                id,
                                                obj.label,
                                                normalizedData,
-                                               { 'default': isDefault }
+                                               { default: isDefault }
                                        )
                                ] );
 
@@ -195,6 +196,7 @@
 
                // Highlights: appending _color to keys
                newData.highlights = {};
+               // eslint-disable-next-line jquery/no-each-util
                $.each( data.highlights, function ( highlightedFilterName, value ) {
                        if ( value ) {
                                newData.highlights[ highlightedFilterName + '_color' ] = data.highlights[ highlightedFilterName ];
@@ -224,6 +226,7 @@
                        data = this.filtersModel.getMinimizedParamRepresentation( fulldata );
 
                // Split highlight/params
+               // eslint-disable-next-line jquery/no-each-util
                $.each( data, function ( param, value ) {
                        if ( param !== 'highlight' && highlightParamNames.indexOf( param ) > -1 ) {
                                normalizedData.highlights[ param ] = value;
@@ -243,7 +246,7 @@
                                randomID,
                                label,
                                normalizedData,
-                               { 'default': isDefault }
+                               { default: isDefault }
                        )
                ] );