Merge "Cleanup live update feature flag and FilterWrapperWidget"

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index 466b7c0..c62d6f2 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -44,9 +44,6 @@
 
                                return result;
                        }
-               },
-               featureFlags: {
-                       liveUpdate: mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' )
                }
        };
 }( mediaWiki ) );

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
index 6be6968..c10011c 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
@@ -32,7 +32,7 @@
                } );
 
                this.$element
-                       .addClass( 'mw-rcfilters-ui-changesLimitButtonWidget' );
+                       .addClass( 'mw-rcfilters-ui-changesLimitAndDateButtonWidget' );
        };
 
        /* Initialization */

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 1cd7bef..dba24fc 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -43,7 +43,7 @@
                        this.changesListModel
                );
 
-               this.numChangesWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
+               this.numChangesAndDateWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
                        this.controller,
                        this.model,
                        {
@@ -59,6 +59,12 @@
                        classes: [ 'mw-rcfilters-ui-filterWrapperWidget-showNewChanges' ]
                } );
 
+               // Events
+               this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
+               this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
+               this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
+               this.showNewChangesLink.toggle( false );
+
                // Initialize
                this.$top = $( '<div>' )
                        .addClass( 'mw-rcfilters-ui-filterWrapperWidget-top' );
@@ -67,19 +73,13 @@
                        .addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom' )
                        .append(
                                this.showNewChangesLink.$element,
-                               this.numChangesWidget.$element
+                               this.numChangesAndDateWidget.$element
                        );
 
-               if ( mw.rcfilters.featureFlags.liveUpdate ) {
+               if ( mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' ) ) {
                        $bottom.prepend( this.liveUpdateButton.$element );
                }
 
-               // Events
-               this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
-               this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
-               this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
-               this.showNewChangesLink.toggle( false );
-
                this.$element
                        .addClass( 'mw-rcfilters-ui-filterWrapperWidget' )
                        .append(