wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-23 18:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "React to hooks that are fired when inline switch is present"

Browse source
This commit is contained in:
jenkins-bot 2023-06-26 05:29:44 +00:00 committed by Gerrit Code Review
parent 611b1988cf 4a028f1336
commit f22f0d4c68
3 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Hooks.php
View file

@ -170,7 +170,7 @@ class Hooks implements TextSlotDiffRendererTablePrefixHook {
] ); ] );
$output->addModules( 'ext.visualEditor.diffPage.init' ); $output->addModules( 'ext.visualEditor.diffPage.init' );
$output->enableOOUI(); $output->enableOOUI();
$parts['ve-init-mw-diffPage-diffMode'] = '<div class="ve-init-mw-diffPage-diffMode">' . $parts['50_ve-init-mw-diffPage-diffMode'] = '<div class="ve-init-mw-diffPage-diffMode">' .
// Will be replaced by a ButtonSelectWidget in JS // Will be replaced by a ButtonSelectWidget in JS
new ButtonGroupWidget( [ new ButtonGroupWidget( [
'items' => [ 'items' => [

4
modules/ve-mw/preinit/styles/ve.init.mw.DiffPage.less
View file

@ -101,7 +101,3 @@
} }
} }
} }
.ve-init-diff-inline-legend-hidden {
visibility: hidden;
}

37
modules/ve-mw/preinit/ve.init.mw.DiffPage.init.js
View file

@ -15,14 +15,15 @@
progress = new OO.ui.ProgressBarWidget( { classes: [ 've-init-mw-diffPage-loading' ] } ), progress = new OO.ui.ProgressBarWidget( { classes: [ 've-init-mw-diffPage-loading' ] } ),
originalUrl = new URL( location.href ), originalUrl = new URL( location.href ),
initMode = originalUrl.searchParams.get( 'diffmode' ) || mw.user.options.get( 'visualeditor-diffmode-historical' ) || 'source', initMode = originalUrl.searchParams.get( 'diffmode' ) || mw.user.options.get( 'visualeditor-diffmode-historical' ) || 'source',
initType = originalUrl.searchParams.get( 'diff-type' ),
conf = mw.config.get( 'wgVisualEditorConfig' ), conf = mw.config.get( 'wgVisualEditorConfig' ),
pluginModules = conf.pluginModules.filter( mw.loader.getState ); pluginModules = conf.pluginModules.filter( mw.loader.getState ),
diffTypeSwitch;
if ( initMode !== 'visual' ) { if ( initMode !== 'visual' ) {
// Enforce a valid mode, to avoid visual glitches in button-selection. // Enforce a valid mode, to avoid visual glitches in button-selection.
initMode = 'source'; initMode = 'source';
} }
var mode = initMode;
$visualDiffContainer.append( $visualDiffContainer.append(
progress.$element.addClass( 'oo-ui-element-hidden' ), progress.$element.addClass( 'oo-ui-element-hidden' ),
@ -39,16 +40,25 @@
newPageName = params.get( 'page2' ); newPageName = params.get( 'page2' );
} }
var mode = item.getData(); mode = item.getData();
var isVisual = mode === 'visual'; var isVisual = mode === 'visual';
$visualDiffContainer.toggleClass( 'oo-ui-element-hidden', !isVisual ); $visualDiffContainer.toggleClass( 'mw-diff-element-hidden', !isVisual );
$wikitextDiffBody.toggleClass( 'oo-ui-element-hidden', isVisual ); $wikitextDiffBody.toggleClass( 'mw-diff-element-hidden', isVisual );
if ( typeof diffTypeSwitch !== 'undefined' ) {
diffTypeSwitch.setDisabled( isVisual );
if ( !isVisual ) {
if ( diffTypeSwitch.getValue() ) {
$wikitextDiffBody.closest( 'tr:not(.inline-diff-row)' ).addClass( 'mw-diff-element-hidden' );
} else {
$wikitextDiffBody.closest( 'tr.inline-diff-row' ).addClass( 'mw-diff-element-hidden' );
}
}
}
var $revSlider = $( '.mw-revslider-container' ); var $revSlider = $( '.mw-revslider-container' );
$revSlider.toggleClass( 've-init-mw-diffPage-revSlider-visual', isVisual ); $revSlider.toggleClass( 've-init-mw-diffPage-revSlider-visual', isVisual );
if ( initType === 'inline' ) {
$( '.mw-diff-inline-legend' ).toggleClass( 've-init-diff-inline-legend-hidden', isVisual );
}
if ( isVisual ) { if ( isVisual ) {
// Highlight the headers using the same styles as the diff, to better indicate // Highlight the headers using the same styles as the diff, to better indicate
// the meaning of headers when not using two-column diff. // the meaning of headers when not using two-column diff.
@ -99,7 +109,7 @@
} }
function onReviewModeButtonSelectChoose( item ) { function onReviewModeButtonSelectChoose( item ) {
var mode = item.getData(); mode = item.getData();
if ( mode !== mw.user.options.get( 'visualeditor-diffmode-historical' ) ) { if ( mode !== mw.user.options.get( 'visualeditor-diffmode-historical' ) ) {
mw.user.options.set( 'visualeditor-diffmode-historical', mode ); mw.user.options.set( 'visualeditor-diffmode-historical', mode );
// Same as ve.init.target.getLocalApi() // Same as ve.init.target.getLocalApi()
@ -135,4 +145,13 @@
$( '.ve-init-mw-diffPage-diffMode' ).empty().append( reviewModeButtonSelect.$element ); $( '.ve-init-mw-diffPage-diffMode' ).empty().append( reviewModeButtonSelect.$element );
reviewModeButtonSelect.selectItemByData( initMode ); reviewModeButtonSelect.selectItemByData( initMode );
} ); } );
mw.hook( 'wikipage.diff.wikitextBodyUpdate' ).add( function ( $wikitextBody ) {
$wikitextDiffBody = $wikitextBody;
} );
mw.hook( 'wikipage.diff.diffTypeSwitch' ).add( function ( inlineToggleSwitch ) {
diffTypeSwitch = inlineToggleSwitch;
diffTypeSwitch.setDisabled( mode === 'visual' );
} );
}() ); }() );