From 2a035342e66d456bcbb54ace2146e8e1495b7abc Mon Sep 17 00:00:00 2001 From: jmnote Date: Fri, 9 Oct 2026 00:04:52 +0900 Subject: [PATCH] Drop the pre-1.0 wgSmjUseCdn fallback 1.0 intentionally does not read pre-1.0 setting names (docs/mig-1.0.md). Falling back to defaults when page config is missing is enough. --- resources/ext.SimpleMathJax.js | 16 +--------------- tests/JsDefaultsTest.php | 14 -------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/resources/ext.SimpleMathJax.js b/resources/ext.SimpleMathJax.js index c949ff5f..cb36f9dc 100644 --- a/resources/ext.SimpleMathJax.js +++ b/resources/ext.SimpleMathJax.js @@ -17,23 +17,9 @@ var defaults = { wgSmjScale: 1 }; -// Pre-1.0 names of settings that were only renamed (see docs/mig-1.0.md), -// consulted for pages cached before the upgrade. Settings whose meaning or -// default changed in 1.0 (e.g. delimiters) are not mapped. -var legacyNames = { - wgSmjCdnEnabled: 'wgSmjUseCdn' -}; - -function isSet(value) { - return value !== null && value !== undefined; -} - function config(name) { var value = mw.config.get(name); - if (!isSet(value) && legacyNames[name]) { - value = mw.config.get(legacyNames[name]); - } - return isSet(value) ? value : defaults[name]; + return value === null || value === undefined ? defaults[name] : value; } function ensureLoaded() { diff --git a/tests/JsDefaultsTest.php b/tests/JsDefaultsTest.php index 0d61e515..d0c61a21 100644 --- a/tests/JsDefaultsTest.php +++ b/tests/JsDefaultsTest.php @@ -44,19 +44,5 @@ function assert_same( $name, $expected, $actual ) { assert_same( "$name default matches extension.json", $expected, $value ); } -// Legacy names are only for settings the migration guide lists as renamed. -if ( preg_match( '/var legacyNames = (\{.*?\});/s', $js, $m ) ) { - preg_match_all( "/(\w+): '(\w+)'/", $m[1], $pairs, PREG_SET_ORDER ); - $guide = file_get_contents( __DIR__ . '/../docs/mig-1.0.md' ); - foreach ( $pairs as [ , $name, $legacy ] ) { - assert_same( "$name has a client default", true, array_key_exists( $name, $defaults ?? [] ) ); - assert_same( - "$legacy -> $name is a rename in docs/mig-1.0.md", - 1, - preg_match( '/\| `\$' . $legacy . '` \| `\$' . $name . '` \|/', $guide ) - ); - } -} - echo $failures === 0 ? "\nAll tests passed.\n" : "\n$failures test(s) FAILED.\n"; exit( $failures === 0 ? 0 : 1 );