From 693087b886a66d7030c5ea4cfe66a05cd9d69741 Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Thu, 13 Jul 2023 08:09:07 -0700 Subject: [PATCH] Don't load mediawiki.ui.button on page load 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: Ib4e228908d2813898654886bc1ee76e90dc52f22 --- extension.json | 4 ++-- resources/js/ext.uls.compactlinks.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extension.json b/extension.json index 1ee295d9..d39a8881 100644 --- a/extension.json +++ b/extension.json @@ -157,6 +157,7 @@ "vector-2022": "css/ext.uls-vector.less" }, "dependencies": [ + "mediawiki.ui.button", "jquery.uls.data", "mediawiki.api", "mediawiki.cookie", @@ -172,8 +173,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..63e86422 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(); + } ); mw.hook( 'mw.uls.compactlinks.initialized' ).fire( true ); };