Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions resources/ext.SimpleMathJax.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
14 changes: 0 additions & 14 deletions tests/JsDefaultsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Loading