Merge "RC filters: custom help link for beta users"

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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 745273c..746907b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -23,7 +23,7 @@
 
                        // eslint-disable-next-line no-new
                        new mw.rcfilters.ui.FormWrapperWidget(
-                               changesListModel, $( '.rcoptions form' ) );
+                               changesListModel, controller, $( 'fieldset.rcoptions' ) );
 
                        controller.initialize( {
                                registration: {
@@ -184,7 +184,7 @@
                                }
                        } );
 
-                       $( '.rcoptions' ).before( filtersWidget.$element );
+                       $( '.rcfilters-container' ).append( filtersWidget.$element );
                        $( 'body' ).append( $overlay );
 
                        // HACK: Remove old-style filter links for filters handled by the widget
@@ -226,7 +226,6 @@
                        } );
 
                        window.addEventListener( 'popstate', function () {
-                               controller.updateFromURL();
                                controller.updateChangesList();
                        } );