From f574c09b32617b7872effed336ea7ccef8b5c335 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Wed, 21 Jun 2017 13:31:35 -0700 Subject: [PATCH] RCFilters: Remove view triggers before checking emptiness of string Bug: T168220 Change-Id: I3ae6fba358456745cb570840211319f7eac754ce --- .../dm/mw.rcfilters.dm.FiltersViewModel.js | 15 +++++++++++++++ .../mw.rcfilters.ui.FilterTagMultiselectWidget.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) 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 ebffaa0e6f..d84a00a1db 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -1044,4 +1044,19 @@ filterItem.clearHighlightColor(); } ); }; + + /** + * Return a version of the given string that is without any + * view triggers. + * + * @param {string} str Given string + * @return {string} Result + */ + mw.rcfilters.dm.FiltersViewModel.prototype.removeViewTriggers = function ( str ) { + if ( this.getViewByTrigger( str.substr( 0, 1 ) ) !== 'default' ) { + str = str.substr( 1 ); + } + + return str; + }; }( mediaWiki, jQuery ) ); diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index 268138fbda..025adeab7f 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -400,7 +400,7 @@ this.selectTag( tagItem ); // Scroll to the item - if ( oldInputValue ) { + if ( this.model.removeViewTriggers( oldInputValue ) ) { // We're binding a 'once' to the itemVisibilityChange event // so this happens when the menu is ready after the items // are visible again, in case this is done right after the -- 2.20.1