Merge "resourceloader: Simplify StringSet fallback"

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

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index 682a937..0204013 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
        /**
         * Filter item model
         *
@@ -94,6 +94,7 @@
 
                key = key || 'contextDescription';
 
+               // eslint-disable-next-line no-restricted-properties
                $.each( conflicts, function ( filterName, conflict ) {
                        if ( !conflict.item.isSelected() ) {
                                return;
@@ -139,7 +140,7 @@
                                // if the item is also not highlighted. See T161273
                                superset = this.getSuperset();
                                // For this message we need to collect the affecting superset
-                               affectingItems = this.getGroupModel().getSelectedItems( this )
+                               affectingItems = this.getGroupModel().findSelectedItems( this )
                                        .filter( function ( item ) {
                                                return superset.indexOf( item.getName() ) !== -1;
                                        } )
@@ -149,7 +150,7 @@
 
                                messageKey = 'rcfilters-state-message-subset';
                        } else if ( this.isFullyCovered() && !this.isHighlighted() ) {
-                               affectingItems = this.getGroupModel().getSelectedItems( this )
+                               affectingItems = this.getGroupModel().findSelectedItems( this )
                                        .map( function ( item ) {
                                                return mw.msg( 'quotation-marks', item.getLabel() );
                                        } );
@@ -395,4 +396,4 @@
                return this.visible;
        };
 
-}( mediaWiki ) );
+}() );