From: Moriel Schottlender <moriel@gmail.com>
Date: Wed, 14 Jun 2017 20:04:01 +0000 (-0700)
Subject: RCFilters: Always replaceState the URL
X-Git-Tag: 1.31.0-rc.0~2960^2
X-Git-Url: https://git.heureux-cyclage.org/index.php?a=commitdiff_plain;h=2b0b5c335facfc1e951dc9f8807f006e7a00211f;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Always replaceState the URL

Allow users to hit 'back' button to actually go back to their
previous page, rather than use 'back' button to undo their filter
toggling before they're allowed to go back to their previous
page.

Bug: T167919
Change-Id: I171799bd5c139addebcccc4799003f040c3f119b
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index c5672ae499..14f5a2864a 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -590,13 +590,7 @@
 			this.uriProcessor.getVersion( currentUri.query ) !== 2 ||
 			this.uriProcessor.isNewState( currentUri.query, updatedUri.query )
 		) {
-			if ( this.initializing ) {
-				// Initially, when we just build the first page load
-				// out of defaults, we want to replace the history
-				mw.rcfilters.UriProcessor.static.replaceState( updatedUri );
-			} else {
-				mw.rcfilters.UriProcessor.static.pushState( updatedUri );
-			}
+			mw.rcfilters.UriProcessor.static.replaceState( updatedUri );
 		}
 	};
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 6e62436267..da6bf8a0b4 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -36,12 +36,6 @@
 			// Set as ready
 			$( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' );
 
-			window.addEventListener( 'popstate', function () {
-				// Update the state of the model from the URL
-				// and re-fetch results into the changes list
-				controller.updateStateFromUrl();
-			} );
-
 			$( 'a.mw-helplink' ).attr(
 				'href',
 				'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:New_filters_for_edit_review'