RCFilters: Add title attribute to highlighted rows

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / ui / mw.rcfilters.ui.ChangesListWrapperWidget.js

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 7eab6cb..955e01d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -48,7 +48,9 @@
                // Set up highlight containers
                this.setupHighlightContainers( this.$element );
 
-               this.setupNewChangesButtonContainer( this.$element );
+               if ( mw.rcfilters.featureFlags.liveUpdate ) {
+                       this.setupNewChangesButtonContainer( this.$element );
+               }
        };
 
        /* Initialization */
@@ -167,7 +169,7 @@
         * @param {string} from Anything newer than this is considered 'new'
         */
        mw.rcfilters.ui.ChangesListWrapperWidget.prototype.emphasizeNewChanges = function ( from ) {
-               var $lastSeen,
+               var $firstNew,
                        $indicator,
                        $newChanges = $( [] ),
                        selector = this.inEnhancedMode() ?
@@ -182,25 +184,20 @@
 
                        if ( ts >= from ) {
                                $newChanges = $newChanges.add( $this );
-                               $lastSeen = $this;
+                               $firstNew = $this;
 
                                // guards against putting the marker after the last element
                                if ( index === ( length - 1 ) ) {
-                                       $lastSeen = null;
+                                       $firstNew = null;
                                }
                        }
                } );
 
-               if ( $lastSeen ) {
+               if ( $firstNew ) {
                        $indicator = $( '<div>' )
-                               .addClass( 'mw-rcfilters-ui-changesListWrapperWidget-previousChangesIndicator' )
-                               .text( mw.message( 'rcfilters-previous-changes-label' ).text() );
-
-                       $indicator.on( 'click', function () {
-                               $indicator.detach();
-                       } );
+                               .addClass( 'mw-rcfilters-ui-changesListWrapperWidget-previousChangesIndicator' );
 
-                       $lastSeen.after( $indicator );
+                       $firstNew.after( $indicator );
                }
 
                $newChanges
@@ -306,10 +303,33 @@
                }
 
                this.filtersViewModel.getHighlightedItems().forEach( function ( filterItem ) {
+                       var $elements = this.$element.find( '.' + filterItem.getCssClass() );
+
                        // Add highlight class to all highlighted list items
-                       this.$element.find( '.' + filterItem.getCssClass() )
+                       $elements
                                .addClass( 'mw-rcfilters-highlight-color-' + filterItem.getHighlightColor() );
+
+                       $elements.each( function () {
+                               var filterString = $( this ).attr( 'data-highlightedFilters' ) || '',
+                                       filters = filterString ? filterString.split( '|' ) : [];
+
+                               if ( filters.indexOf( filterItem.getLabel() ) === -1 ) {
+                                       filters.push( filterItem.getLabel() );
+                               }
+
+                               $( this )
+                                       .attr( 'data-highlightedFilters', filters.join( '|' ) );
+                       } );
                }.bind( this ) );
+               // Apply a title for relevant filters
+               this.$element.find( '[data-highlightedFilters]' ).each( function () {
+                       var filterString = $( this ).attr( 'data-highlightedFilters' ) || '',
+                               filters = filterString ? filterString.split( '|' ) : [];
+
+                       if ( filterString ) {
+                               $( this ).attr( 'title', mw.msg( 'rcfilters-highlighted-filters-list', filters.join( ', ' ) ) );
+                       }
+               } );
 
                // Turn on highlights
                this.$element.addClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlighted' );
@@ -324,6 +344,9 @@
                        this.$element.find( '.mw-rcfilters-highlight-color-' + color ).removeClass( 'mw-rcfilters-highlight-color-' + color );
                }.bind( this ) );
 
+               this.$element.find( '[data-highlightedFilters]' )
+                       .removeAttr( 'title' )
+                       .removeAttr( 'data-highlightedFilters' );
                // Turn off highlights
                this.$element.removeClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlighted' );
        };