Merge "RCFilters: Don't emit wikipage.content on first load"

diff --combined resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index a9283b9,0abfb34..5dd830b
--- 1/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
--- 2/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@@ -15,8 -15,6 +15,8 @@@
                this.baseFilterState = {};
                this.uriProcessor = null;
                this.initializing = false;
 +
 +              this.prevLoggedItems = [];
        };
  
        /* Initialization */
@@@ -138,7 -136,8 +138,8 @@@
                        // so it gets processed
                        this.changesListModel.update(
                                $changesList.length ? $changesList : 'NO_RESULTS',
-                               $( 'fieldset.rcoptions' ).first()
+                               $( 'fieldset.rcoptions' ).first(),
+                               true // We're using existing DOM elements
                        );
                }
  
@@@ -223,9 -222,6 +224,9 @@@
                        this.filtersModel.toggleFilterSelected( filterName, false );
                        this.updateChangesList();
                        this.filtersModel.reassessFilterInteractions( filterItem );
 +
 +                      // Log filter grouping
 +                      this.trackFilterGroupings( 'removefilter' );
                }
  
                if ( isHighlighted ) {
@@@ -417,9 -413,6 +418,9 @@@
                        this.filtersModel.reassessFilterInteractions();
  
                        this.updateChangesList();
 +
 +                      // Log filter grouping
 +                      this.trackFilterGroupings( 'savedfilters' );
                }
        };
  
@@@ -810,51 -803,4 +811,51 @@@
                );
        };
  
 +      /**
 +       * Track filter grouping usage
 +       *
 +       * @param {string} action Action taken
 +       */
 +      mw.rcfilters.Controller.prototype.trackFilterGroupings = function ( action ) {
 +              var controller = this,
 +                      rightNow = new Date().getTime(),
 +                      randomIdentifier = String( mw.user.sessionId() ) + String( rightNow ) + String( Math.random() ),
 +                      // Get all current filters
 +                      filters = this.filtersModel.getSelectedItems().map( function ( item ) {
 +                              return item.getName();
 +                      } );
 +
 +              action = action || 'filtermenu';
 +
 +              // Check if these filters were the ones we just logged previously
 +              // (Don't log the same grouping twice, in case the user opens/closes)
 +              // the menu without action, or with the same result
 +              if (
 +                      // Only log if the two arrays are different in size
 +                      filters.length !== this.prevLoggedItems.length ||
 +                      // Or if any filters are not the same as the cached filters
 +                      filters.some( function ( filterName ) {
 +                              return controller.prevLoggedItems.indexOf( filterName ) === -1;
 +                      } ) ||
 +                      // Or if any cached filters are not the same as given filters
 +                      this.prevLoggedItems.some( function ( filterName ) {
 +                              return filters.indexOf( filterName ) === -1;
 +                      } )
 +              ) {
 +                      filters.forEach( function ( filterName ) {
 +                              mw.track(
 +                                      'event.ChangesListFilterGrouping',
 +                                      {
 +                                              action: action,
 +                                              groupIdentifier: randomIdentifier,
 +                                              filter: filterName,
 +                                              userId: mw.user.getId()
 +                                      }
 +                              );
 +                      } );
 +
 +                      // Cache the filter names
 +                      this.prevLoggedItems = filters;
 +              }
 +      };
  }( mediaWiki, jQuery ) );