Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342165 )
Change subject: RCFilters UI: Change tooltip for subsetted/included filters
......................................................................
RCFilters UI: Change tooltip for subsetted/included filters
Bug: T156864
Change-Id: Ic97c7c6aae78bb6ddf51f0294eeae4b7f86a1a1d
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
4 files changed, 31 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/342165/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 2816f31..4b02880 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1375,6 +1375,7 @@
"rcfilters-highlightmenu-title": "Select a color",
"rcfilters-highlightmenu-help": "Select a color to highlight this
property",
"rcfilters-filterlist-noresults": "No filters found",
+ "rcfilters-subset-title": "This filter has no effect because its
results are already included with those of the following broader
{{PLURAL:$2|filter|filters}} (try using highlighting to distinguishing this
property): $1",
"rcfilters-filtergroup-registration": "User registration",
"rcfilters-filter-registered-label": "Registered",
"rcfilters-filter-registered-description": "Logged-in editors.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index ece8262..6ad8bc0 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1562,6 +1562,7 @@
"rcfilters-highlightmenu-title": "Title for the highlight menu used to
select the highlight color for an individual filter.",
"rcfilters-highlightmenu-help": "Tooltip for the highlight menu for
individual filters.",
"rcfilters-filterlist-noresults": "Message showing no results found for
searching a filter.",
+ "rcfilters-subset-title": "Tooltip shown when hovering over a filter
tag when one or more broader filters that contain the hovered filter are also
selected. This indicates that the hovered filter has no effect because all the
results it matches are also matched by the broader filter(s). Parameters:\n*
$1 - Comma-separated string of selected broader filters that this filter is a
subset of\n* $2 - Count of filters in $1, for PLURAL",
"rcfilters-filtergroup-registration": "Title for the filter group for
editor registration type.",
"rcfilters-filter-registered-label": "Label for the filter for showing
edits made by logged-in users.\n{{Identical|Registered}}",
"rcfilters-filter-registered-description": "Description for the filter
for showing edits made by logged-in users.",
diff --git a/resources/Resources.php b/resources/Resources.php
index 7a2ba69..fff6618 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1810,10 +1810,12 @@
'rcfilters-highlightbutton-title',
'rcfilters-highlightmenu-title',
'rcfilters-highlightmenu-help',
+ 'rcfilters-subset-title',
'recentchanges-noresult',
],
'dependencies' => [
'oojs-ui',
+ 'mediawiki.language',
'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-editing-core',
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index f28523a..3c6f7fc 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -13,15 +13,12 @@
* @cfg {jQuery} [$overlay] A jQuery object serving as overlay for
popups
*/
mw.rcfilters.ui.CapsuleItemWidget = function
MwRcfiltersUiCapsuleItemWidget( controller, model, config ) {
- var $popupContent = $( '<div>' )
- .addClass(
'mw-rcfilters-ui-capsuleItemWidget-popup-content' ),
- descLabelWidget = new OO.ui.LabelWidget();
-
// Configuration initialization
config = config || {};
this.controller = controller;
this.model = model;
+ this.popupLabel = new OO.ui.LabelWidget();
this.$overlay = config.$overlay || this.$element;
this.positioned = false;
this.popupTimeoutShow = null;
@@ -39,15 +36,13 @@
padded: false,
align: 'center',
position: 'above',
- $content: $popupContent
- .append( descLabelWidget.$element ),
+ $content: $( '<div>' )
+ .addClass(
'mw-rcfilters-ui-capsuleItemWidget-popup-content' )
+ .append( this.popupLabel.$element ),
$floatableContainer: this.$element,
classes: [
'mw-rcfilters-ui-capsuleItemWidget-popup' ]
}
}, config ) );
-
- // Set initial text for the popup - the description
- descLabelWidget.setLabel( this.model.getDescription() );
this.$highlight = $( '<div>' )
.addClass(
'mw-rcfilters-ui-capsuleItemWidget-highlight' );
@@ -147,7 +142,29 @@
* Respond to mouse enter event
*/
mw.rcfilters.ui.CapsuleItemWidget.prototype.onMouseEnter = function () {
- if ( this.model.getDescription() ) {
+ var labelText, includingFilters,
+ superset = this.model.getSuperset();
+
+ if ( this.model.isIncluded() ) {
+ includingFilters =
this.model.getGroupModel().getSelectedItems()
+ .filter( function ( otherFilter ) {
+ return superset.indexOf(
otherFilter.getName() ) > -1;
+ } )
+ .map( function ( otherFilter ) {
+ return otherFilter.getLabel();
+ } );
+ labelText = mw.msg(
+ 'rcfilters-subset-title',
+ mw.language.listToText( includingFilters ),
+ includingFilters.length
+ );
+ } else {
+ labelText = this.model.getDescription();
+ }
+
+ if ( labelText ) {
+ this.popupLabel.setLabel( labelText );
+
if ( !this.positioned ) {
// Recalculate anchor position to be center of
the capsule item
this.popup.$anchor.css( 'margin-left', (
this.$element.width() / 2 ) );
--
To view, visit https://gerrit.wikimedia.org/r/342165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic97c7c6aae78bb6ddf51f0294eeae4b7f86a1a1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
