wikimedia/mediawiki-extensions-RevisionSlider
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/RevisionSlider synced 2024-11-14 19:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge large chunk of code duplication in SliderArrowView

Browse source 
This was almost the exact same code, with very few differences (e.g.
different CSS classes, and different icons).

Another change in the same file is the removal of an extra
`!== undefined` check. This is impossible. I can't tell why this was
there. Maybe an artifact from when this was developed?

This code cleanup is motivated by T352169, but doesn't solve it.

Bug: T352169
Change-Id: I3bb7ce00f9b754f9ba58310100b855c8ee3fca4a
This commit is contained in:
thiemowmde 2024-01-27 13:16:52 +01:00 committed by Dreamy Jazz
parent e7aab0bd7c
commit ed2c0a8b73
2 changed files with 31 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
modules/ext.RevisionSlider.SliderArrowView.js
View file

@ -16,97 +16,60 @@ $.extend( SliderArrowView.prototype, {
sliderView: null, sliderView: null,
/** /**
* Renders the backwards arrow button, returns it * @param {number} direction -1 or 1
* and renders and adds the popup for it.
*
* @return {OO.ui.ButtonWidget} * @return {OO.ui.ButtonWidget}
*/ */
renderBackwardArrow: function () { renderArrowButton: function ( direction ) {
const backwardArrowButton = new OO.ui.ButtonWidget( { const prev = direction < 0;
icon: 'previous', const button = new OO.ui.ButtonWidget( {
icon: prev ? 'previous' : 'next',
width: 20, width: 20,
height: 140, height: 140,
framed: true, framed: true,
classes: [ 'mw-revslider-arrow', 'mw-revslider-arrow-backwards' ] classes: [
'mw-revslider-arrow',
prev ? 'mw-revslider-arrow-backwards' : 'mw-revslider-arrow-forwards'
]
} ); } );
const backwardArrowPopup = new OO.ui.PopupWidget( { const tooltip = mw.msg( prev ? 'revisionslider-arrow-tooltip-older' : 'revisionslider-arrow-tooltip-newer' );
$content: $( '<p>' ).text( mw.msg( 'revisionslider-arrow-tooltip-older' ) ), const popup = new OO.ui.PopupWidget( {
$floatableContainer: backwardArrowButton.$element, $content: $( '<p>' ).text( tooltip ),
$floatableContainer: button.$element,
width: 200, width: 200,
classes: [ 'mw-revslider-tooltip', 'mw-revslider-arrow-tooltip' ] classes: [ 'mw-revslider-tooltip', 'mw-revslider-arrow-tooltip' ]
} ); } );
backwardArrowButton.connect( this, { button.connect( this, { click: [ 'arrowClickHandler', button ] } );
click: [ 'arrowClickHandler', backwardArrowButton ]
} );
backwardArrowButton.$element button.$element
.attr( 'data-dir', -1 ) .attr( 'data-dir', direction )
.children().attr( 'aria-label', mw.msg( 'revisionslider-arrow-tooltip-older' ) ) .children().attr( 'aria-label', tooltip )
.on( 'mouseover', { button: backwardArrowButton, popup: backwardArrowPopup }, this.showPopup ) .on( 'mouseover', { button: button, popup: popup }, this.showPopup )
.on( 'mouseout', { popup: backwardArrowPopup }, this.hidePopup ) .on( 'mouseout', { popup: popup }, this.hidePopup )
.on( 'focusin', { button: backwardArrowButton }, this.arrowFocusHandler ); .on( 'focusin', { button: button }, this.arrowFocusHandler );
$( document.body ).append( backwardArrowPopup.$element ); $( document.body ).append( popup.$element );
return backwardArrowButton; return button;
},
/**
* Renders the forwards arrow button, returns it
* and renders and adds the popup for it.
*
* @return {OO.ui.ButtonWidget}
*/
renderForwardArrow: function () {
const forwardArrowButton = new OO.ui.ButtonWidget( {
icon: 'next',
width: 20,
height: 140,
framed: true,
classes: [ 'mw-revslider-arrow', 'mw-revslider-arrow-forwards' ]
} );
const forwardArrowPopup = new OO.ui.PopupWidget( {
$content: $( '<p>' ).text( mw.msg( 'revisionslider-arrow-tooltip-newer' ) ),
$floatableContainer: forwardArrowButton.$element,
width: 200,
classes: [ 'mw-revslider-tooltip', 'mw-revslider-arrow-tooltip' ]
} );
forwardArrowButton.connect( this, {
click: [ 'arrowClickHandler', forwardArrowButton ]
} );
forwardArrowButton.$element
.attr( 'data-dir', 1 )
.children().attr( 'aria-label', mw.msg( 'revisionslider-arrow-tooltip-newer' ) )
.on( 'mouseover', { button: forwardArrowButton, popup: forwardArrowPopup }, this.showPopup )
.on( 'mouseout', { popup: forwardArrowPopup }, this.hidePopup )
.on( 'focusin', { button: forwardArrowButton }, this.arrowFocusHandler );
$( document.body ).append( forwardArrowPopup.$element );
return forwardArrowButton;
}, },
showPopup: function ( e ) { showPopup: function ( e ) {
const button = e.data.button, if ( e.data.button.isDisabled() ) {
popup = e.data.popup;
if ( typeof button !== 'undefined' && button.isDisabled() ) {
return; return;
} }
const $button = $( this );
const popup = e.data.popup;
popup.$element.css( { popup.$element.css( {
left: $( this ).offset().left + $( this ).outerWidth() / 2 + 'px', left: $button.offset().left + $button.outerWidth() / 2 + 'px',
top: $( this ).offset().top + $( this ).outerHeight() + 'px' top: $button.offset().top + $button.outerHeight() + 'px'
} ); } );
popup.toggle( true ); popup.toggle( true );
}, },
hidePopup: function ( e ) { hidePopup: function ( e ) {
const popup = e.data.popup; e.data.popup.toggle( false );
popup.toggle( false );
}, },
/** /**

4
modules/ext.RevisionSlider.SliderView.js
View file

@ -82,8 +82,8 @@ $.extend( SliderView.prototype, {
this.pointerOlder = this.pointerOlder || new Pointer( 'mw-revslider-pointer-older' ); this.pointerOlder = this.pointerOlder || new Pointer( 'mw-revslider-pointer-older' );
this.pointerNewer = this.pointerNewer || new Pointer( 'mw-revslider-pointer-newer' ); this.pointerNewer = this.pointerNewer || new Pointer( 'mw-revslider-pointer-newer' );
this.backwardArrowButton = sliderArrowView.renderBackwardArrow(); this.backwardArrowButton = sliderArrowView.renderArrowButton( -1 );
this.forwardArrowButton = sliderArrowView.renderForwardArrow(); this.forwardArrowButton = sliderArrowView.renderArrowButton( 1 );
this.$element = $( '<div>' ) this.$element = $( '<div>' )
.addClass( 'mw-revslider-revision-slider' ) .addClass( 'mw-revslider-revision-slider' )