From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 12 May 2017 01:07:34 +0000 (+0000)
Subject: Merge "RCFilters UI: Don't remove removed saved links twice"
X-Git-Tag: 1.31.0-rc.0~3269
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=3c97f1b788a1e31f71760dbcc1e9e68b6c561bac;hp=75483c87221833b87e877361cd918bc58e2ba255;p=lhc%2Fweb%2Fwiklou.git

Merge "RCFilters UI: Don't remove removed saved links twice"
---

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 ) );