Merge "Move around "ا" to after "آ" and not before"

[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 4263c51..67edb4f 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -2,27 +2,42 @@
  * JavaScript for Special:RecentChanges
  */
 ( function ( mw, $ ) {
-       /**
-        * @class mw.rcfilters
-        * @singleton
-        */
        var rcfilters = {
-               /** */
+               /**
+                * @member mw.rcfilters
+                * @private
+                */
                init: function () {
-                       var filtersModel = new mw.rcfilters.dm.FiltersViewModel(),
+                       var $topLinks,
+                               rcTopSection,
+                               $watchlistDetails,
+                               wlTopSection,
+                               savedQueriesPreferenceName = mw.config.get( 'wgStructuredChangeFiltersSavedQueriesPreferenceName' ),
+                               filtersModel = new mw.rcfilters.dm.FiltersViewModel(),
                                changesListModel = new mw.rcfilters.dm.ChangesListViewModel(),
                                savedQueriesModel = new mw.rcfilters.dm.SavedQueriesModel(),
-                               controller = new mw.rcfilters.Controller( filtersModel, changesListModel, savedQueriesModel ),
+                               controller = new mw.rcfilters.Controller(
+                                       filtersModel, changesListModel, savedQueriesModel,
+                                       {
+                                               savedQueriesPreferenceName: savedQueriesPreferenceName
+                                       }
+                               ),
                                $overlay = $( '<div>' )
                                        .addClass( 'mw-rcfilters-ui-overlay' ),
                                filtersWidget = new mw.rcfilters.ui.FilterWrapperWidget(
-                                       controller, filtersModel, savedQueriesModel, { $overlay: $overlay } );
+                                       controller, filtersModel, savedQueriesModel, changesListModel, { $overlay: $overlay } ),
+                               savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget(
+                                       controller, savedQueriesModel, { $overlay: $overlay }
+                               ),
+                               currentPage = mw.config.get( 'wgCanonicalNamespace' ) +
+                                       ':' +
+                                       mw.config.get( 'wgCanonicalSpecialPageName' );
 
                        // TODO: The changesListWrapperWidget should be able to initialize
                        // after the model is ready.
                        // eslint-disable-next-line no-new
                        new mw.rcfilters.ui.ChangesListWrapperWidget(
-                               filtersModel, changesListModel, $( '.mw-changeslist, .mw-changeslist-empty' ) );
+                               filtersModel, changesListModel, controller, $( '.mw-changeslist, .mw-changeslist-empty' ) );
 
                        controller.initialize(
                                mw.config.get( 'wgStructuredChangeFilters' ),
@@ -32,10 +47,11 @@
 
                        // eslint-disable-next-line no-new
                        new mw.rcfilters.ui.FormWrapperWidget(
-                               filtersModel, changesListModel, controller, $( 'fieldset.rcoptions' ) );
+                               filtersModel, changesListModel, controller, $( 'fieldset.cloptions' ) );
 
                        $( '.rcfilters-container' ).append( filtersWidget.$element );
                        $( 'body' ).append( $overlay );
+                       $( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' );
 
                        $( 'a.mw-helplink' ).attr(
                                'href',
@@ -43,6 +59,26 @@
                        );
 
                        controller.replaceUrl();
+
+                       if ( currentPage === 'Special:Recentchanges' ||
+                               currentPage === 'Special:Recentchangeslinked' ) {
+                               $topLinks = $( '.mw-recentchanges-toplinks' ).detach();
+
+                               rcTopSection = new mw.rcfilters.ui.RcTopSectionWidget(
+                                       savedLinksListWidget, $topLinks
+                               );
+                               filtersWidget.setTopSection( rcTopSection.$element );
+                       } // end Special:RC
+
+                       if ( currentPage === 'Special:Watchlist' ) {
+                               $( '#contentSub, form#mw-watchlist-resetbutton' ).detach();
+                               $watchlistDetails = $( '.watchlistDetails' ).detach().contents();
+
+                               wlTopSection = new mw.rcfilters.ui.WatchlistTopSectionWidget(
+                                       controller, changesListModel, savedLinksListWidget, $watchlistDetails
+                               );
+                               filtersWidget.setTopSection( wlTopSection.$element );
+                       } // end Special:WL
                }
        };