From 5481573341a8fd81483e8478938af0952b9dc953 Mon Sep 17 00:00:00 2001
From: Jdlrobson <jrobson@wikimedia.org>
Date: Fri, 8 Dec 2023 21:29:24 +0000
Subject: [PATCH] Revert "Use Codex styles for buttons in language overlay"

This reverts commit d29050d08069601dd4c87839f990165740fe2889.

Reason for revert: I had mistakenly assumed the @wikimedia/codex
module was loaded on clicking the language button. It appears to
be added on page load.

Given T248718 it's still unclear what our policy on loading
@wikimedia/codex on page load is and given several people are out
I think it would be better to attempt this again next week, possibly
delaying further if needed.

Bug: T353071
Bug: T248718
Change-Id: I09334a1faec06a7400e61013ddda374156bf5d72
---
 extension.json                              | 11 ++++----
 resources/css/ext.uls.displaysettings.less  |  3 +--
 resources/css/ext.uls.inputsettings.less    |  4 +--
 resources/css/ext.uls.languagesettings.less | 10 ++-----
 resources/js/ext.uls.actions.menu.js        |  2 +-
 resources/js/ext.uls.compactlinks.js        |  4 +--
 resources/js/ext.uls.displaysettings.js     | 29 ++++++++++-----------
 resources/js/ext.uls.inputsettings.js       | 18 ++++++-------
 resources/js/ext.uls.interface.js           | 11 ++------
 resources/js/ext.uls.languagesettings.js    |  4 +--
 resources/js/ext.uls.setlang.js             |  4 +--
 11 files changed, 42 insertions(+), 58 deletions(-)

diff --git a/extension.json b/extension.json
index 42d94c4b..fe0665f6 100644
--- a/extension.json
+++ b/extension.json
@@ -172,8 +172,7 @@
 			"dependencies": [
 				"mediawiki.jqueryMsg",
 				"mediawiki.language",
-				"ext.uls.common",
-				"@wikimedia/codex"
+				"ext.uls.common"
 			],
 			"messages": [
 				"ext-uls-compact-link-count",
@@ -210,7 +209,9 @@
 				"ext.uls.mediawiki",
 				"ext.uls.webfonts",
 				"mediawiki.api",
-				"@wikimedia/codex",
+				"mediawiki.ui.radio",
+				"mediawiki.ui.checkbox",
+				"mediawiki.ui.button",
 				"mediawiki.user"
 			]
 		},
@@ -278,7 +279,7 @@
 				"ext.uls.messages",
 				"ext.uls.preferences",
 				"jquery.uls.grid",
-				"@wikimedia/codex"
+				"mediawiki.ui.button"
 			]
 		},
 		"ext.uls.mediawiki": {
@@ -346,7 +347,7 @@
 			"dependencies": [
 				"mediawiki.api",
 				"mediawiki.jqueryMsg",
-				"@wikimedia/codex",
+				"mediawiki.ui.button",
 				"mediawiki.Uri"
 			],
 			"messages": [
diff --git a/resources/css/ext.uls.displaysettings.less b/resources/css/ext.uls.displaysettings.less
index 86675f33..7cd82297 100644
--- a/resources/css/ext.uls.displaysettings.less
+++ b/resources/css/ext.uls.displaysettings.less
@@ -9,8 +9,7 @@
 .uls-button-group {
 	display: inline-block;
 	position: relative;
-	// The 1px are needed to handle overflow in .cdx-button-group in 1.39
-	padding: 1px 0 0 1px;
+	padding: 0;
 	left: -20px;
 	z-index: 1;
 }
diff --git a/resources/css/ext.uls.inputsettings.less b/resources/css/ext.uls.inputsettings.less
index 16d5d344..fe6c4db2 100644
--- a/resources/css/ext.uls.inputsettings.less
+++ b/resources/css/ext.uls.inputsettings.less
@@ -96,8 +96,8 @@
 	}
 }
 
-.uls-input-settings .cdx-radio {
-	position: relative;
+.uls-input-settings-inputmethods-list .mw-ui-radio {
+	display: block;
 }
 
 .uls-ime-notification-bubble .link {
diff --git a/resources/css/ext.uls.languagesettings.less b/resources/css/ext.uls.languagesettings.less
index df1bab06..83330bd1 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -130,20 +130,14 @@
 	margin-left: 15px;
 }
 
-// This can be removed when 1.39 support is dropped.
-.uls-input-settings-inputmethods-list .cdx-radio__label,
-.checkbox.cdx-checkbox__label {
-	padding-left: ~'calc(1.25em + 8px)';
-}
-
 .uls-ui-languages p,
 .checkbox {
 	color: @color-subtle;
 	font-size: 10pt;
 }
 
-/* @todo: Amend to use Codex when 1.39 support is no longer needed. */
-#languagesettings-panels .uls-cdx-button-pressed {
+/* mediawiki.ui does not have a pressed state style. */
+#languagesettings-panels .mw-ui-pressed {
 	background-color: @background-color-progressive--active;
 	color: @color-inverted;
 	border-color: @border-color-progressive--active;
diff --git a/resources/js/ext.uls.actions.menu.js b/resources/js/ext.uls.actions.menu.js
index da1852a6..960badff 100644
--- a/resources/js/ext.uls.actions.menu.js
+++ b/resources/js/ext.uls.actions.menu.js
@@ -15,7 +15,7 @@
 
 	ActionsMenu.template = '<div class="uls-menu uls-language-actions-dialog">' +
 			'<div class="uls-language-actions-title">' +
-				'<button class="cdx-button cdx-button--weight-quiet uls-language-actions-close"></button>' +
+				'<button class="mw-ui-button mw-ui-quiet uls-language-actions-close"></button>' +
 				'<span> <strong></strong> </span>' +
 			'</div>' +
 			'<div class="uls-language-action-items"></div>' +
diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js
index 4c4a9493..392d7333 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -190,7 +190,7 @@
 			this.compactList[ language ].parentNode.style.display = '';
 		}
 
-		mw.loader.using( '@wikimedia/codex' ).then( function () {
+		mw.loader.using( 'mediawiki.ui.button' ).then( function () {
 			this.addTrigger();
 		}.bind( this ) );
 
@@ -330,7 +330,7 @@
 	CompactInterlanguageList.prototype.addTrigger = function () {
 		var trigger = document.createElement( 'button' );
 		// TODO: Should we have a different class name where the CLS styles are attached?
-		trigger.className = 'mw-interlanguage-selector cdx-button';
+		trigger.className = 'mw-interlanguage-selector mw-ui-button';
 		trigger.title = mw.message( 'ext-uls-compact-link-info' ).plain();
 		// Use text() because the message needs {{PLURAL:}}
 		trigger.textContent = mw.message(
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 14f49348..9232c5cd 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -25,10 +25,10 @@
 		// Tab switcher buttons
 		'<div class="row">' +
 		'<div class="twelve columns uls-display-settings-tab-switcher">' +
-		'<div class="uls-button-group cdx-button-group">' +
-		'<button id="uls-display-settings-language-tab" class="cdx-button uls-cdx-button-pressed" ' +
+		'<div class="uls-button-group mw-ui-button-group">' +
+		'<button id="uls-display-settings-language-tab" class="mw-ui-button mw-ui-pressed" ' +
 		'data-i18n="ext-uls-display-settings-language-tab"></button>' +
-		'<button id="uls-display-settings-fonts-tab" class="cdx-button" data-i18n="ext-uls-display-settings-fonts-tab"></button>' +
+		'<button id="uls-display-settings-fonts-tab" class="mw-ui-button" data-i18n="ext-uls-display-settings-fonts-tab"></button>' +
 		'</div>' +
 		'</div>' +
 		'</div>' +
@@ -87,10 +87,9 @@
 		// Webfonts enabling checkbox with label
 		'<div class="row">' +
 		'<div class="twelve columns">' +
-		'<div class="cdx-checkbox">' +
-		'<input type="checkbox" id="webfonts-enable-checkbox" class="cdx-checkbox__input" />' +
-		'<span class="cdx-checkbox__icon"></span>' +
-		'<label class="checkbox cdx-checkbox__label" for="webfonts-enable-checkbox" >' +
+		'<div class="mw-ui-checkbox">' +
+		'<input type="checkbox" id="webfonts-enable-checkbox" />' +
+		'<label class="checkbox" for="webfonts-enable-checkbox" >' +
 		'<strong data-i18n="ext-uls-webfonts-settings-title"></strong> ' +
 		'<span data-i18n="ext-uls-webfonts-settings-info"></span> ' +
 		'<a target="_blank" href="https://www.mediawiki.org/wiki/Universal_Language_Selector/WebFonts" data-i18n="ext-uls-webfonts-settings-info-link"></a>' +
@@ -259,8 +258,8 @@
 				return function () {
 					displaySettings.markDirty();
 					displaySettings.uiLanguage = button.data( 'language' ) || displaySettings.uiLanguage;
-					$( 'div.uls-ui-languages button.cdx-button' ).removeClass( 'uls-cdx-button-pressed' );
-					button.addClass( 'uls-cdx-button-pressed' );
+					$( 'div.uls-ui-languages button.mw-ui-button' ).removeClass( 'mw-ui-pressed' );
+					button.addClass( 'mw-ui-pressed' );
 					displaySettings.prepareUIFonts();
 					displaySettings.preview( displaySettings.uiLanguage );
 				};
@@ -270,7 +269,7 @@
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
 				language = languagesForButtons[ i ];
 				$button = $( '<button>' )
-					.addClass( 'cdx-button uls-language-button autonym' )
+					.addClass( 'mw-ui-button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
 					.prop( {
 						lang: language,
@@ -278,7 +277,7 @@
 					} );
 
 				if ( language === this.uiLanguage ) {
-					$button.addClass( 'uls-cdx-button-pressed' );
+					$button.addClass( 'mw-ui-pressed' );
 				}
 
 				$button.data( 'language', language );
@@ -299,7 +298,7 @@
 			$languages = this.$template.find( 'div.uls-ui-languages' );
 			$moreLanguagesButton = $( '<button>' )
 				.prop( 'class', 'uls-more-languages' )
-				.addClass( 'cdx-button' ).text( '...' );
+				.addClass( 'mw-ui-button' ).text( '...' );
 
 			$languages.append( $moreLanguagesButton );
 			// Show the long language list to select a language for display settings
@@ -589,7 +588,7 @@
 				var $button = $( this );
 
 				// eslint-disable-next-line no-jquery/no-class-state
-				if ( $button.hasClass( 'uls-cdx-button-pressed' ) ) {
+				if ( $button.hasClass( 'mw-ui-pressed' ) ) {
 					return;
 				}
 
@@ -605,8 +604,8 @@
 				} );
 
 				displaySettings.$parent.position();
-				$tabButtons.removeClass( 'uls-cdx-button-pressed' );
-				$button.addClass( 'uls-cdx-button-pressed' );
+				$tabButtons.removeClass( 'mw-ui-pressed' );
+				$button.addClass( 'mw-ui-pressed' );
 			} ).on( 'mousedown', function ( event ) {
 				// Avoid taking focus, to avoid bad looking focus styles
 				event.preventDefault();
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index dade2957..fe16caeb 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -54,7 +54,7 @@
 		'<div class="row">' +
 		'<div class="twelve columns uls-input-settings-disable-info"></div>' +
 		'<div class="ten columns uls-input-settings-toggle">' +
-		'<button class="cdx-button cdx-button--action-progressive active uls-input-toggle-button"></button>' +
+		'<button class="mw-ui-button mw-ui-progressive active uls-input-toggle-button"></button>' +
 		'</div>' +
 		'</div>';
 
@@ -169,11 +169,10 @@
 				return $();
 			}
 
-			$imeLabel = $( '<label>' ).attr( 'for', imeId ).addClass( 'cdx-radio__label' );
+			$imeLabel = $( '<label>' ).attr( 'for', imeId );
 
 			$inputMethodItem = $( '<input>' ).attr( {
 				type: 'radio',
-				class: 'cdx-radio__input',
 				name: 'ime',
 				id: imeId,
 				value: imeId
@@ -212,10 +211,9 @@
 				$helplink
 			);
 
-			var $icon = $( '<span>' ).addClass( 'cdx-radio__icon' );
 			return $( '<div>' )
-				.addClass( 'cdx-radio' )
-				.append( $inputMethodItem, $icon, $imeLabel );
+				.addClass( 'mw-ui-radio' )
+				.append( $inputMethodItem, $imeLabel );
 		},
 
 		/**
@@ -280,8 +278,8 @@
 						$.ime.preferences.setLanguage( selectedLang );
 					}
 					// Mark the button selected
-					$( '.uls-ui-languages .cdx-button' ).removeClass( 'uls-cdx-button-pressed' );
-					button.addClass( 'uls-cdx-button-pressed' );
+					$( '.uls-ui-languages .mw-ui-button' ).removeClass( 'mw-ui-pressed' );
+					button.addClass( 'mw-ui-pressed' );
 					inputSettings.prepareInputmethods( selectedLang );
 				};
 			}
@@ -292,7 +290,7 @@
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
 				language = languagesForButtons[ i ];
 				$button = $( '<button>' )
-					.addClass( 'cdx-button uls-language-button autonym' )
+					.addClass( 'mw-ui-button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
 					.prop( {
 						lang: language,
@@ -324,7 +322,7 @@
 			$languages = this.$template.find( '.uls-ui-languages' );
 			$moreLanguagesButton = $( '<button>' )
 				.prop( 'class', 'uls-more-languages' )
-				.addClass( 'cdx-button' ).text( '...' );
+				.addClass( 'mw-ui-button' ).text( '...' );
 
 			$languages.append( $moreLanguagesButton );
 			// Show the long language list to select a language for ime settings
diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index d52c76a9..4396924c 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -121,14 +121,7 @@
 	 * @return {jQuery}
 	 */
 	function createMenuButton( buttonClass ) {
-		// cdx-button--type-quiet is needed for 1.39 support.
-		// Please remove when support is no longer needed.
-		var classes = [
-			'cdx-button',
-			'cdx-button--weight-quiet',
-			'cdx-button--type-quiet',
-			buttonClass
-		];
+		var classes = [ 'mw-ui-button', 'mw-ui-quiet', buttonClass ];
 		// eslint-disable-next-line mediawiki/class-doc
 		return $( '<button>' ).addClass( classes );
 	}
@@ -587,7 +580,7 @@
 
 		ev.preventDefault();
 
-		mw.loader.using( [ 'ext.uls.mediawiki', '@wikimedia/codex' ] ).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 ];
diff --git a/resources/js/ext.uls.languagesettings.js b/resources/js/ext.uls.languagesettings.js
index f8bb14a1..b7acf5f9 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -35,8 +35,8 @@
 	// Apply and Cancel buttons
 	buttonsRow = '<div class="row collapse language-settings-buttons">' +
 		'<div class="twelve columns">' +
-		'<button class="cdx-button uls-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>' +
-		'<button class="cdx-button cdx-button--action-progressive active uls-settings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>' +
+		'<button class="mw-ui-button uls-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>' +
+		'<button class="mw-ui-button mw-ui-progressive active uls-settings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>' +
 		'</div>' +
 		'</div>' +
 		'</div>';
diff --git a/resources/js/ext.uls.setlang.js b/resources/js/ext.uls.setlang.js
index 3c58550d..e85ceca1 100644
--- a/resources/js/ext.uls.setlang.js
+++ b/resources/js/ext.uls.setlang.js
@@ -42,11 +42,11 @@
 
 	function getButtons() {
 		$cancelBtn = $( '<button>' )
-			.addClass( 'cdx-button uls-setlang-cancel' )
+			.addClass( 'mw-ui-button uls-setlang-cancel' )
 			.text( mw.msg( 'ext-uls-setlang-cancel' ) );
 
 		$acceptBtn = $( '<button>' )
-			.addClass( 'cdx-button cdx-button--action-progressive active uls-setlang-apply' )
+			.addClass( 'mw-ui-button mw-ui-progressive active uls-setlang-apply' )
 			.text( mw.msg( 'ext-uls-setlang-accept' ) );
 
 		return $( '<div>' )