From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Thu, 11 May 2017 01:27:47 +0000 (-0700)
Subject: RCFilters UI: Don't remove removed saved links twice
X-Git-Tag: 1.31.0-rc.0~3269^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=9ef0027faac460cdd1888f38249cf0b6a6f58f5d;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Don't remove removed saved links twice

The second removal also didn't remove the right thing.

Change-Id: Iab32ae2e19e2b19995b88fbfd2e84a36dbda1bac
---

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 9ae1d34fb5..40186aa1f8 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -86,7 +86,6 @@
 	 */
 	mw.rcfilters.ui.SavedLinksListWidget.prototype.onMenuItemRemove = function ( item ) {
 		this.controller.removeSavedQuery( item.getID() );
-		this.menu.removeItems( [ item ] );
 	};
 
 	/**
@@ -131,7 +130,7 @@
 	 * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item
 	 */
 	mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelRemoveItem = function ( item ) {
-		this.menu.removeItems( [ this.model.getItemByID( item.getID() ) ] );
+		this.menu.removeItems( [ this.menu.getItemFromData( item.getID() ) ] );
 		this.button.toggle( !this.menu.isEmpty() );
 	};
 }( mediaWiki ) );