X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fdm%2Fmw.rcfilters.dm.FiltersViewModel.js;h=cdf1f63517ed09ca529e2c141c72a6a1d4b378d7;hp=bbc1d7e629f2a49d2aa2d9e2f995708b5986b2c6;hb=a2c8c2969420a0f150c03f76e3a0bf9028fcda43;hpb=005857aba57362d415b9436f2341f5456b6a3567

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 bbc1d7e629..cdf1f63517 100644
--- 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,8 +910,8 @@
 	 */
 	mw.rcfilters.dm.FiltersViewModel.prototype.areNamespacesEffectivelyInverted = function () {
 		return this.getInvertModel().isSelected() &&
-			this.getSelectedItems().some( function ( itemModel ) {
-				return itemModel.getGroupModel().getView() === 'namespace';
+			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;