RCFilters UI: Create tooltips for filter states

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / dm / mw.rcfilters.dm.FiltersViewModel.js

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 cf51424..ca0282d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -188,14 +188,20 @@
                                                adjustedConflicts = {};
 
                                        conflicts.forEach( function ( conflict ) {
+                                               var filter;
+
                                                if ( conflict.filter ) {
                                                        filterName = model.groups[ conflict.group ].getNamePrefix() + conflict.filter;
+                                                       filter = model.getItemByName( filterName );
 
                                                        // Rename
                                                        adjustedConflicts[ filterName ] = $.extend(
                                                                {},
                                                                conflict,
-                                                               { filter: filterName }
+                                                               {
+                                                                       filter: filterName,
+                                                                       item: filter
+                                                               }
                                                        );
                                                } else {
                                                        // This conflict is for an entire group. Split it up to
@@ -207,7 +213,10 @@
                                                                adjustedConflicts[ groupItem.getName() ] = $.extend(
                                                                        {},
                                                                        conflict,
-                                                                       { filter: groupItem.getName() }
+                                                                       {
+                                                                               filter: groupItem.getName(),
+                                                                               item: groupItem
+                                                                       }
                                                                );
                                                        } );
                                                }
@@ -305,6 +314,9 @@
                        }
                } );
 
+               // Add items to the model
+               this.addItems( items );
+
                // Expand conflicts
                groupConflictResult = expandConflictDefinitions( groupConflictMap );
                filterConflictResult = expandConflictDefinitions( filterConflictMap );
@@ -337,9 +349,6 @@
                        }
                } );
 
-               // Add items to the model
-               this.addItems( items );
-
                this.emit( 'initialize' );
        };