From f3cf47705219b94c209464dbd3f45c128e702b69 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Mon, 16 Sep 2024 22:26:46 +0330
Subject: [PATCH] Replace uses of mw.Uri with browser native URL

Bug: T374314
Change-Id: I03bfc2618b5b499f9c65832f8af20a7a199e03ec
---
 extension.json                  | 2 +-
 resources/js/ext.uls.setlang.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension.json b/extension.json
index b1db7c50..89b538b0 100644
--- a/extension.json
+++ b/extension.json
@@ -326,7 +326,7 @@
 				"mediawiki.api",
 				"mediawiki.jqueryMsg",
 				"@wikimedia/codex",
-				"mediawiki.Uri"
+				"web2017-polyfills"
 			],
 			"messages": [
 				"ext-uls-setlang-error",
diff --git a/resources/js/ext.uls.setlang.js b/resources/js/ext.uls.setlang.js
index 71a02431..021152ee 100644
--- a/resources/js/ext.uls.setlang.js
+++ b/resources/js/ext.uls.setlang.js
@@ -67,13 +67,13 @@
 	 * @return {string}
 	 */
 	function currentUrlWithoutSetLang() {
-		var uri = new mw.Uri();
-		delete uri.query.setlang;
-		return uri.toString();
+		var url = new URL( location.href );
+		url.searchParams.remove( 'setlang' );
+		return url.toString();
 	}
 
 	function removeSetLangFromHistory() {
-		if ( 'setlang' in mw.Uri().query ) {
+		if ( new URL( location.href ).searchParams.has( 'setlang' ) ) {
 			history.replaceState( null, '', currentUrlWithoutSetLang() );
 		}
 	}