wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-11-30 18:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix settings dialog offering ReferencePreviews when unavailable"

Browse source
This commit is contained in:
jenkins-bot 2021-05-03 08:32:55 +00:00 committed by Gerrit Code Review
parent 3c59226bd3 75155a076a
commit d7869a0086
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/dist/index.js vendored
View file

Binary file not shown.

BIN
resources/dist/index.js.map.json vendored
View file

Binary file not shown.

6
src/index.js
View file

@ -181,7 +181,8 @@ function registerChangeListeners(
pagePreviewGateway = createPagePreviewGateway( mw.config ), pagePreviewGateway = createPagePreviewGateway( mw.config ),
referenceGateway = createReferenceGateway(), referenceGateway = createReferenceGateway(),
userSettings = createUserSettings( mw.storage ), userSettings = createUserSettings( mw.storage ),
settingsDialog = createSettingsDialogRenderer( mw.config ), referencePreviewsState = isReferencePreviewsEnabled( mw.user, userSettings, mw.config ),
settingsDialog = createSettingsDialogRenderer( referencePreviewsState !== null ),
experiments = createExperiments( mw.experiments ), experiments = createExperiments( mw.experiments ),
statsvTracker = getStatsvTracker( mw.user, mw.config, experiments ), statsvTracker = getStatsvTracker( mw.user, mw.config, experiments ),
pageviewTracker = getPageviewTracker( mw.config ), pageviewTracker = getPageviewTracker( mw.config ),
@ -193,8 +194,7 @@ function registerChangeListeners(
initiallyEnabled = { initiallyEnabled = {
[ previewTypes.TYPE_PAGE ]: [ previewTypes.TYPE_PAGE ]:
createIsPagePreviewsEnabled( mw.user, userSettings, mw.config ), createIsPagePreviewsEnabled( mw.user, userSettings, mw.config ),
[ previewTypes.TYPE_REFERENCE ]: [ previewTypes.TYPE_REFERENCE ]: referencePreviewsState
isReferencePreviewsEnabled( mw.user, userSettings, mw.config )
}; };
// If debug mode is enabled, then enable Redux DevTools. // If debug mode is enabled, then enable Redux DevTools.

6
src/ui/settingsDialog.js
View file

@ -8,10 +8,10 @@ import { previewTypes } from '../preview/model';
/** /**
* Create the settings dialog shown to anonymous users. * Create the settings dialog shown to anonymous users.
* *
* @param {boolean} isReferencePreviewsInBeta * @param {boolean} referencePreviewsAvaliable
* @return {JQuery} settings dialog * @return {JQuery} settings dialog
*/ */
export function createSettingsDialog( isReferencePreviewsInBeta ) { export function createSettingsDialog( referencePreviewsAvaliable ) {
const choices = [ const choices = [
{ {
id: previewTypes.TYPE_PAGE, id: previewTypes.TYPE_PAGE,
@ -26,7 +26,7 @@ export function createSettingsDialog( isReferencePreviewsInBeta ) {
]; ];
// TODO: Remove when not in Beta any more // TODO: Remove when not in Beta any more
if ( isReferencePreviewsInBeta ) { if ( !referencePreviewsAvaliable ) {
// Anonymous users can't access reference previews as long as they are in beta // Anonymous users can't access reference previews as long as they are in beta
choices.splice( 1, 1 ); choices.splice( 1, 1 );
} }

6
src/ui/settingsDialogRenderer.js
View file

@ -8,10 +8,10 @@ import { createSettingsDialog } from './settingsDialog';
* Creates a render function that will create the settings dialog and return * Creates a render function that will create the settings dialog and return
* a set of methods to operate on it * a set of methods to operate on it
* *
* @param {mw.Map} config * @param {boolean} referencePreviewsAvaliable
* @return {Function} render function * @return {Function} render function
*/ */
export default function createSettingsDialogRenderer( config ) { export default function createSettingsDialogRenderer( referencePreviewsAvaliable ) {
/** /**
* Cached settings dialog * Cached settings dialog
* *
@ -33,7 +33,7 @@ export default function createSettingsDialogRenderer( config ) {
*/ */
return ( boundActions ) => { return ( boundActions ) => {
if ( !$dialog ) { if ( !$dialog ) {
$dialog = createSettingsDialog( config.get( 'wgPopupsReferencePreviewsBetaFeature' ) ); $dialog = createSettingsDialog( referencePreviewsAvaliable );
$overlay = $( '<div>' ).addClass( 'mwe-popups-overlay' ); $overlay = $( '<div>' ).addClass( 'mwe-popups-overlay' );
// Setup event bindings // Setup event bindings