From cd364dbdd51fbc18bf887d8e8e18cf37cb0d1e2e Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Thu, 9 Feb 2017 06:55:29 -0500 Subject: [PATCH] RC filters: Let the group widget know its own name Bug: T156533 Bug: T156215 Change-Id: I21f9df4286208cbe1609b06174066863eb4da6fb --- .../dm/mw.rcfilters.dm.FilterGroup.js | 11 +++++++++++ .../dm/mw.rcfilters.dm.FiltersViewModel.js | 1 + 2 files changed, 12 insertions(+) diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js index bc911f4aa7..da9e59e7c5 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js @@ -7,6 +7,7 @@ * * @constructor * @param {Object} [config] Configuration options + * @cfg {string} [name] Group name * @cfg {string} [type='send_unselected_if_any'] Group type * @cfg {string} [title] Group title * @cfg {string} [separator='|'] Value separator for 'string_options' groups @@ -20,6 +21,7 @@ OO.EventEmitter.call( this ); OO.EmitterList.call( this ); + this.name = config.name; this.type = config.type || 'send_unselected_if_any'; this.title = config.title; this.separator = config.separator || '|'; @@ -76,6 +78,15 @@ return this.active; }; + /** + * Get group name + * + * @return {string} Group name + */ + mw.rcfilters.dm.FilterGroup.prototype.getName = function () { + return this.name; + }; + /** * Get group type * 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 3c4ed4b9d1..5bbeabf3cc 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -162,6 +162,7 @@ $.each( filters, function ( group, data ) { if ( !model.groups[ group ] ) { model.groups[ group ] = new mw.rcfilters.dm.FilterGroup( { + name: group, type: data.type, title: data.title, separator: data.separator, -- 2.20.1