RCFilters UI: Rework conflicts to be objects in filter or group context
authorMoriel Schottlender <moriel@gmail.com>
Fri, 10 Mar 2017 23:22:12 +0000 (15:22 -0800)
committerCatrope <roan@wikimedia.org>
Thu, 16 Mar 2017 21:29:26 +0000 (21:29 +0000)
commite27da9d8a54450df766da5611b1ce7b9d95f5b71
tree768e6c8c6f03921a9ff1fa7dfce6d7e875639cf3
parenta43c2d13fc336c1692103d6687244b166720f1fd
RCFilters UI: Rework conflicts to be objects in filter or group context

Allow conflicts to be defined in either the filter or the group context
and represent a whole object rather than an array of filter names.

Bug: T160453
Bug: T152754
Bug: T156427
Change-Id: I2423eb2618aa64bf30395b1a1912589e0c71f283
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js