Merge "Add support for 'hu-formal'"

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

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index c9f5924..cdf1f63 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -149,7 +149,7 @@
                                                groupModel.areAllSelectedInConflictWith( filterItem ) &&
                                                // Every selected member of the item's own group is also
                                                // in conflict with the other group
-                                               filterItemGroup.getSelectedItems().every( function ( otherGroupItem ) {
+                                               filterItemGroup.findSelectedItems().every( function ( otherGroupItem ) {
                                                        return groupModel.areAllSelectedInConflictWith( otherGroupItem );
                                                } )
                                        );
@@ -185,7 +185,7 @@
        mw.rcfilters.dm.FiltersViewModel.prototype.getFirstConflictedItem = function () {
                var conflictedItem;
 
-               $.each( this.getItems(), function ( index, filterItem ) {
+               this.getItems().forEach( function ( filterItem ) {
                        if ( filterItem.isSelected() && filterItem.isConflicted() ) {
                                conflictedItem = filterItem;
                                return false;
@@ -910,7 +910,7 @@
         */
        mw.rcfilters.dm.FiltersViewModel.prototype.areNamespacesEffectivelyInverted = function () {
                return this.getInvertModel().isSelected() &&
-                       this.getSelectedItems().some( function ( itemModel ) {
+                       this.findSelectedItems().some( function ( itemModel ) {
                                return itemModel.getGroupModel().getName() === 'namespace';
                        } );
        };
@@ -1086,11 +1086,11 @@
         *
         * @return {mw.rcfilters.dm.FilterItem[]} Selected items
         */
-       mw.rcfilters.dm.FiltersViewModel.prototype.getSelectedItems = function () {
+       mw.rcfilters.dm.FiltersViewModel.prototype.findSelectedItems = function () {
                var allSelected = [];
 
                $.each( this.getFilterGroups(), function ( groupName, groupModel ) {
-                       allSelected = allSelected.concat( groupModel.getSelectedItems() );
+                       allSelected = allSelected.concat( groupModel.findSelectedItems() );
                } );
 
                return allSelected;