X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fmw.rcfilters.init.js;h=da11973a26a225b4d4bd0fba3dc0ea08ef95927e;hp=a6bce1434e4e11480a7f6112bc4bba651743dc74;hb=be08b7aa186d15c341c8e59d49d6b80a11369c87;hpb=3e88f9fa2a5a00bc1330560accf8e9d09c8be42a

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index a6bce1434e..da11973a26 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -8,10 +8,10 @@
 		 * @private
 		 */
 		init: function () {
-			var toplinksTitle,
-				topLinksCookieName = 'rcfilters-toplinks-collapsed-state',
-				topLinksCookie = mw.cookie.get( topLinksCookieName ),
-				topLinksCookieValue = topLinksCookie || 'collapsed',
+			var $topLinks,
+				rcTopSection,
+				$watchlistDetails,
+				wlTopSection,
 				savedQueriesPreferenceName = mw.config.get( 'wgStructuredChangeFiltersSavedQueriesPreferenceName' ),
 				filtersModel = new mw.rcfilters.dm.FiltersViewModel(),
 				changesListModel = new mw.rcfilters.dm.ChangesListViewModel(),
@@ -26,10 +26,10 @@
 					.addClass( 'mw-rcfilters-ui-overlay' ),
 				filtersWidget = new mw.rcfilters.ui.FilterWrapperWidget(
 					controller, filtersModel, savedQueriesModel, changesListModel, { $overlay: $overlay } ),
-				markSeenButton,
-				currentPage = mw.config.get( 'wgCanonicalNamespace' ) +
-					':' +
-					mw.config.get( 'wgCanonicalSpecialPageName' );
+				savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget(
+					controller, savedQueriesModel, { $overlay: $overlay }
+				),
+				specialPage = mw.config.get( 'wgCanonicalSpecialPageName' );
 
 			// TODO: The changesListWrapperWidget should be able to initialize
 			// after the model is ready.
@@ -37,6 +37,11 @@
 			new mw.rcfilters.ui.ChangesListWrapperWidget(
 				filtersModel, changesListModel, controller, $( '.mw-changeslist, .mw-changeslist-empty' ) );
 
+			// Remove the -loading class that may have been added on the server side.
+			// If we are in fact going to load a default saved query, this .initialize()
+			// call will do that and add the -loading class right back.
+			$( 'body' ).removeClass( 'mw-rcfilters-ui-loading' );
+
 			controller.initialize(
 				mw.config.get( 'wgStructuredChangeFilters' ),
 				mw.config.get( 'wgFormattedNamespaces' ),
@@ -48,8 +53,9 @@
 				filtersModel, changesListModel, controller, $( 'fieldset.cloptions' ) );
 
 			$( '.rcfilters-container' ).append( filtersWidget.$element );
-			$( 'body' ).append( $overlay );
-			$( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' );
+			$( 'body' )
+				.append( $overlay )
+				.addClass( 'mw-rcfilters-ui-initialized' );
 
 			$( 'a.mw-helplink' ).attr(
 				'href',
@@ -58,42 +64,42 @@
 
 			controller.replaceUrl();
 
-			if ( currentPage === 'Special:Recentchanges' ) {
-				toplinksTitle = new OO.ui.ButtonWidget( {
-					framed: false,
-					indicator: topLinksCookieValue === 'collapsed' ? 'down' : 'up',
-					flags: [ 'progressive' ],
-					label: $( '<span>' ).append( mw.message( 'rcfilters-other-review-tools' ).parse() ).contents()
-				} );
-				$( '.mw-recentchanges-toplinks-title' ).replaceWith( toplinksTitle.$element );
-				// Move the top links to a designated area so it's near the
-				// 'saved filters' button and make it collapsible
-				$( '.mw-recentchanges-toplinks' )
-					.addClass( 'mw-rcfilters-ui-ready' )
-					.makeCollapsible( {
-						collapsed: topLinksCookieValue === 'collapsed',
-						$customTogglers: toplinksTitle.$element
-					} )
-					.on( 'beforeExpand.mw-collapsible', function () {
-						mw.cookie.set( topLinksCookieName, 'expanded' );
-						toplinksTitle.setIndicator( 'up' );
-					} )
-					.on( 'beforeCollapse.mw-collapsible', function () {
-						mw.cookie.set( topLinksCookieName, 'collapsed' );
-						toplinksTitle.setIndicator( 'down' );
-					} )
-					.appendTo( '.mw-rcfilters-ui-filterWrapperWidget-top-placeholder' );
+			if ( specialPage === 'Recentchanges' ||
+				specialPage === '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' ) {
-				markSeenButton = new mw.rcfilters.ui.MarkSeenButtonWidget( controller, changesListModel );
-				$( 'form#mw-watchlist-resetbutton' ).detach();
-				filtersWidget.prependToTopRow( markSeenButton );
+			if ( specialPage === '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
+
+			/**
+			 * Fired when initialization of the filtering interface for changes list is complete.
+			 *
+			 * @event structuredChangeFilters_ui_initialized
+			 * @member mw.hook
+			 */
+			mw.hook( 'structuredChangeFilters.ui.initialized' ).fire();
 		}
 	};
 
-	$( rcfilters.init );
+	// Early execute of init
+	if ( document.readyState === 'interactive' || document.readyState === 'complete' ) {
+		rcfilters.init();
+	} else {
+		$( rcfilters.init );
+	}
 
 	module.exports = rcfilters;