wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-14 10:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Consolidate minor code duplications in DiffPage"

Browse source
This commit is contained in:
jenkins-bot 2024-05-28 15:12:39 +00:00 committed by Gerrit Code Review
parent c3204463de e867a49a69
commit f41d5740c1
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,14 +8,13 @@
/* eslint-disable no-jquery/no-global-selector */ /* eslint-disable no-jquery/no-global-selector */
( function () { ( function () {
const $visualDiffContainer = $( '<div>' ), const $visualDiff = $( '<div>' ),
$visualDiff = $( '<div>' ),
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 ),
conf = mw.config.get( 'wgVisualEditorConfig' ), conf = mw.config.get( 'wgVisualEditorConfig' ),
pluginModules = conf.pluginModules.filter( mw.loader.getState ); pluginModules = conf.pluginModules.filter( mw.loader.getState );
let reviewModeButtonSelect, lastDiff, let reviewModeButtonSelect, lastDiff,
$wikitextDiffContainer, $wikitextDiffHeader, $wikitextDiffBody, $wikitextDiffHeader, $wikitextDiffBody,
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',
diffTypeSwitch; diffTypeSwitch;
@ -25,7 +24,7 @@
} }
let mode = initMode; let mode = initMode;
$visualDiffContainer.append( const $visualDiffContainer = $( '<div>' ).append(
progress.$element.addClass( 'oo-ui-element-hidden' ), progress.$element.addClass( 'oo-ui-element-hidden' ),
$visualDiff $visualDiff
); );
@ -51,16 +50,15 @@
diffTypeSwitch.setDisabled( isVisual ); diffTypeSwitch.setDisabled( isVisual );
} }
const $revSlider = $( '.mw-revslider-container' ); $( '.mw-revslider-container' ).toggleClass( 've-init-mw-diffPage-revSlider-visual', isVisual );
$revSlider.toggleClass( 've-init-mw-diffPage-revSlider-visual', 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.
$wikitextDiffHeader.find( '#mw-diff-otitle1' ).attr( 'data-diff-action', 'remove' ); $wikitextDiffHeader.find( '#mw-diff-otitle1' ).attr( 'data-diff-action', 'remove' );
$wikitextDiffHeader.find( '#mw-diff-ntitle1' ).attr( 'data-diff-action', 'insert' ); $wikitextDiffHeader.find( '#mw-diff-ntitle1' ).attr( 'data-diff-action', 'insert' );
} else { } else {
$wikitextDiffHeader.find( '#mw-diff-otitle1' ).removeAttr( 'data-diff-action' ); $wikitextDiffHeader.find( '#mw-diff-otitle1, #mw-diff-ntitle1' )
$wikitextDiffHeader.find( '#mw-diff-ntitle1' ).removeAttr( 'data-diff-action' ); .removeAttr( 'data-diff-action' );
} }
const oldId = mw.config.get( 'wgDiffOldId' ); const oldId = mw.config.get( 'wgDiffOldId' );
@ -125,7 +123,7 @@
return; return;
} }
$wikitextDiffContainer = $( 'table.diff[data-mw="interface"]' ); const $wikitextDiffContainer = $( 'table.diff[data-mw="interface"]' );
$wikitextDiffHeader = $wikitextDiffContainer.find( 'tr.diff-title' ) $wikitextDiffHeader = $wikitextDiffContainer.find( 'tr.diff-title' )
.add( $wikitextDiffContainer.find( 'td.diff-multi, td.diff-notice' ).parent() ); .add( $wikitextDiffContainer.find( 'td.diff-multi, td.diff-notice' ).parent() );
$wikitextDiffBody = $wikitextDiffContainer.find( 'tr' ).not( $wikitextDiffHeader ); $wikitextDiffBody = $wikitextDiffContainer.find( 'tr' ).not( $wikitextDiffHeader );