diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php index c3337191d..7a2ea10f4 100644 --- a/includes/PopupsHooks.php +++ b/includes/PopupsHooks.php @@ -182,7 +182,6 @@ class PopupsHooks { $vars['wgPopupsRestGatewayEndpoint'] = $config->get( 'PopupsRestGatewayEndpoint' ); $vars['wgPopupsStatsvSamplingRate'] = $config->get( 'PopupsStatsvSamplingRate' ); $vars['wgPopupsTextExtractsIntroOnly'] = $config->get( 'PopupsTextExtractsIntroOnly' ); - $vars['wgPopupsReferencePreviewsBetaFeature'] = $config->get( 'PopupsReferencePreviewsBetaFeature' ); } /** @@ -196,7 +195,6 @@ class PopupsHooks { * setting. * * `wgPopupsConflictsWithNavPopupGadget' - The server's notion of whether or not the * user has enabled conflicting Navigational Popups Gadget. - * * * `wgPopupsConflictsWithRefTooltipsGadget' - The server's notion of whether or not the * user has enabled conflicting Reference Tooltips Gadget. * diff --git a/resources/dist/index.js b/resources/dist/index.js index 2b45c8e2a..02b60d050 100644 Binary files a/resources/dist/index.js and b/resources/dist/index.js differ diff --git a/resources/dist/index.js.map.json b/resources/dist/index.js.map.json index 64d901bdf..3924d8c48 100644 Binary files a/resources/dist/index.js.map.json and b/resources/dist/index.js.map.json differ diff --git a/src/setUserConfigFlags.js b/src/setUserConfigFlags.js index 81e875d7b..9aba92971 100644 --- a/src/setUserConfigFlags.js +++ b/src/setUserConfigFlags.js @@ -32,7 +32,7 @@ export default function setUserConfigFlags( config ) { !!( popupsFlags & REFERENCE_PREVIEWS_ENABLED ) ); config.set( - 'wgPopupsReferencePreviewsBeta', + 'wgPopupsReferencePreviewsBetaFeature', !!( popupsFlags & REFERENCE_PREVIEWS_BETA ) ); /* eslint-enable no-bitwise */ diff --git a/src/ui/settingsDialogRenderer.js b/src/ui/settingsDialogRenderer.js index 0e9fd57a7..3949e0c14 100644 --- a/src/ui/settingsDialogRenderer.js +++ b/src/ui/settingsDialogRenderer.js @@ -34,7 +34,7 @@ export default function createSettingsDialogRenderer( config ) { */ return ( boundActions ) => { if ( !$dialog ) { - $dialog = createSettingsDialog( config.get( 'wgPopupsReferencePreviewsBeta' ) ); + $dialog = createSettingsDialog( config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ); $overlay = $( '
' ).addClass( 'mwe-popups-overlay' ); // Setup event bindings diff --git a/tests/node-qunit/setUserConfigFlags.test.js b/tests/node-qunit/setUserConfigFlags.test.js index be138fb82..79fa91700 100644 --- a/tests/node-qunit/setUserConfigFlags.test.js +++ b/tests/node-qunit/setUserConfigFlags.test.js @@ -13,7 +13,7 @@ QUnit.test( 'config settings are successfully set from bitmask', ( assert ) => { config.get( 'wgPopupsConflictsWithNavPopupGadget' ), config.get( 'wgPopupsConflictsWithRefTooltipsGadget' ), config.get( 'wgPopupsReferencePreviews' ), - config.get( 'wgPopupsReferencePreviewsBeta' ) + config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ], [ true, true, true, true ] ); @@ -26,7 +26,7 @@ QUnit.test( 'config settings are successfully set from bitmask', ( assert ) => { config.get( 'wgPopupsConflictsWithNavPopupGadget' ), config.get( 'wgPopupsConflictsWithRefTooltipsGadget' ), config.get( 'wgPopupsReferencePreviews' ), - config.get( 'wgPopupsReferencePreviewsBeta' ) + config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ], [ false, true, false, true ] ); @@ -39,7 +39,7 @@ QUnit.test( 'config settings are successfully set from bitmask', ( assert ) => { config.get( 'wgPopupsConflictsWithNavPopupGadget' ), config.get( 'wgPopupsConflictsWithRefTooltipsGadget' ), config.get( 'wgPopupsReferencePreviews' ), - config.get( 'wgPopupsReferencePreviewsBeta' ) + config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ], [ true, false, true, false ] ); @@ -52,7 +52,7 @@ QUnit.test( 'config settings are successfully set from bitmask', ( assert ) => { config.get( 'wgPopupsConflictsWithNavPopupGadget' ), config.get( 'wgPopupsConflictsWithRefTooltipsGadget' ), config.get( 'wgPopupsReferencePreviews' ), - config.get( 'wgPopupsReferencePreviewsBeta' ) + config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ], [ false, false, false, false ] ); diff --git a/tests/phpunit/PopupsHooksTest.php b/tests/phpunit/PopupsHooksTest.php index 4fd46587d..fd58d9a93 100644 --- a/tests/phpunit/PopupsHooksTest.php +++ b/tests/phpunit/PopupsHooksTest.php @@ -158,7 +158,7 @@ class PopupsHooksTest extends MediaWikiTestCase { ]; $this->setMwGlobals( $config ); PopupsHooks::onResourceLoaderGetConfigVars( $vars, '' ); - $this->assertCount( 8, $vars, 'A configuration is retrieved.' ); + $this->assertCount( 7, $vars, 'A configuration is retrieved.' ); foreach ( $config as $key => $value ) { $this->assertSame(