From 76e78058816bb5deeb00e0c4cb0dbf09955c55ae Mon Sep 17 00:00:00 2001
From: Jon Robson <jdlrobson@gmail.com>
Date: Mon, 17 Jul 2023 13:09:22 -0700
Subject: [PATCH] Don't load mediawiki.ui.button on page load (attempt 2)

The stylesheet is needed on legacy Vector but not modern
Vector 2022 meaning Vector 2022 loads two sets of styles
for buttons.

This is a short term fix until UniversalLanguageSelector can
use Codex.

Bug: T340255
Change-Id: Ie34949e31e93dcfcabc07fa418dec06022159ca7
---
 extension.json                       | 3 +--
 resources/js/ext.uls.compactlinks.js | 4 +++-
 resources/js/ext.uls.interface.js    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension.json b/extension.json
index 1ee295d9..89a74e16 100644
--- a/extension.json
+++ b/extension.json
@@ -172,8 +172,7 @@
 			"dependencies": [
 				"mediawiki.jqueryMsg",
 				"mediawiki.language",
-				"ext.uls.common",
-				"mediawiki.ui.button"
+				"ext.uls.common"
 			],
 			"messages": [
 				"ext-uls-compact-link-count",
diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js
index 72038c78..392d7333 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -190,7 +190,9 @@
 			this.compactList[ language ].parentNode.style.display = '';
 		}
 
-		this.addTrigger();
+		mw.loader.using( 'mediawiki.ui.button' ).then( function () {
+			this.addTrigger();
+		}.bind( this ) );
 
 		mw.hook( 'mw.uls.compactlinks.initialized' ).fire( true );
 	};
diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index 999b83b3..e9b8a0ae 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -578,7 +578,7 @@
 
 		ev.preventDefault();
 
-		mw.loader.using( 'ext.uls.mediawiki' ).then( function () {
+		mw.loader.using( [ 'ext.uls.mediawiki', 'mediawiki.ui.button' ] ).then( function () {
 			var parent, languageNodes, standalone, uls;
 
 			parent = document.querySelectorAll( '.mw-portlet-lang, #p-lang' )[ 0 ];