wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-27 17:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove most uses of jquery.tipsy in MediaViewer

Browse source 
Tipsy was added in I993bf60909024453a14de85af6239bded02eb8a6 however
has since been deprecated and usage is discourage.

Falling back to standard HTML `title` attribute display seems fine. Some
buttons (such as previous/next arrow) have not had a tipsy tooltip.

To be done separately: TipsyDialog which is used for StatusInfo

Bug: T77402
Change-Id: I2f7ae189734ba6d6e67ca703a42ae899ec56729d
This commit is contained in:
Simon Legner 2019-06-11 20:51:23 +02:00 committed by Jdlrobson
parent e5f9cb140a
commit d2ab19fdac
5 changed files with 10 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -103,7 +103,6 @@
"oojs",
"jquery.fullscreen",
"jquery.color",
"jquery.tipsy",
"mmv.bootstrap",
"mmv.head"
],
@ -275,7 +274,6 @@
"mmv.ui.reuse.shareembed/mmv.ui.reuse.embed.less"
],
"dependencies": [
"jquery.tipsy",
"oojs",
"oojs-ui",
"mediawiki.user",

1
includes/Hooks.php
View file

@ -173,7 +173,6 @@ class Hooks implements MakeGlobalVariablesScriptHook {
'useThumbnailGuessing' => (bool)$wgMediaViewerUseThumbnailGuessing,
'imageQueryParameter' => $wgMediaViewerImageQueryParameter,
'recordVirtualViewBeaconURI' => $wgMediaViewerRecordVirtualViewBeaconURI,
'tooltipDelay' => 1000,
'extensions' => $wgMediaViewerExtensions,
];
$vars['wgMediaViewer'] = true;

11
resources/mmv/mmv.lightboxinterface.js
View file

@ -312,17 +312,12 @@
* Setup for canvas navigation buttons
*/
LIP.setupCanvasButtons = function () {
var ui = this,
tooltipDelay = mw.config.get( 'wgMultimediaViewer' ).tooltipDelay;
var ui = this;
this.$closeButton = $( '<button>' )
.text( ' ' )
.addClass( 'mw-mmv-close' )
.prop( 'title', mw.message( 'multimediaviewer-close-popup-text' ).text() )
.tipsy( {
delayIn: tooltipDelay,
gravity: this.correctEW( 'ne' )
} )
.on( 'click', function () {
if ( ui.isFullscreen ) {
ui.$main.trigger( $.Event( 'jq-fullscreen-change.lip' ) );
@ -334,10 +329,6 @@
.text( ' ' )
.addClass( 'mw-mmv-fullscreen' )
.prop( 'title', mw.message( 'multimediaviewer-fullscreen-popup-text' ).text() )
.tipsy( {
delayIn: tooltipDelay,
gravity: this.correctEW( 'ne' )
} )
.on( 'click', function ( e ) {
if ( ui.isFullscreen ) {
ui.exitFullscreen();

31
resources/mmv/ui/mmv.ui.canvasButtons.js
View file

@ -30,8 +30,7 @@
* @param {jQuery} $fullscreenButton The fullscreen button from the parent class.
*/
function CanvasButtons( $container, $closeButton, $fullscreenButton ) {
var buttons = this,
tooltipDelay = mw.config.get( 'wgMultimediaViewer' ).tooltipDelay;
var buttons = this;
mw.mmv.ui.Element.call( this, $container );
@ -42,30 +41,18 @@
.attr( 'role', 'button' )
.addClass( 'mw-mmv-reuse-button' )
.text( '\u00A0' )
.prop( 'title', mw.message( 'multimediaviewer-reuse-link' ).text() )
.tipsy( {
delayIn: tooltipDelay,
gravity: this.correctEW( 'se' )
} );
.prop( 'title', mw.message( 'multimediaviewer-reuse-link' ).text() );
this.$options = $( '<button>' )
.text( ' ' )
.prop( 'title', mw.message( 'multimediaviewer-options-tooltip' ).text() )
.addClass( 'mw-mmv-options-button' )
.tipsy( {
delayIn: tooltipDelay,
gravity: this.correctEW( 'se' )
} );
.addClass( 'mw-mmv-options-button' );
this.$download = $( '<a>' )
.attr( 'role', 'button' )
.addClass( 'mw-mmv-download-button' )
.text( '\u00A0' )
.prop( 'title', mw.message( 'multimediaviewer-download-link' ).text() )
.tipsy( {
delayIn: tooltipDelay,
gravity: this.correctEW( 'se' )
} );
.prop( 'title', mw.message( 'multimediaviewer-download-link' ).text() );
this.$next = $( '<button>' )
.prop( 'title', mw.message( 'multimediaviewer-next-image-alt-text' ).text() )
@ -260,10 +247,7 @@
.add( this.$reuse )
.add( this.$options )
.add( this.$close )
.add( this.$fullscreen )
.each( function () {
$( this ).tipsy( 'enable' );
} );
.add( this.$fullscreen );
};
/**
@ -277,10 +261,7 @@
.add( this.$options )
.add( this.$close )
.add( this.$fullscreen )
.off( 'click.mmv-canvasButtons' )
.each( function () {
$( this ).tipsy( 'hide' ).tipsy( 'disable' );
} );
.off( 'click.mmv-canvasButtons' );
};
/**

22
resources/mmv/ui/mmv.ui.metadataPanel.js
View file

@ -79,9 +79,6 @@
.add( this.$authorAndSource )
.add( this.title.$ellipsis )
.add( this.creditField.$ellipsis )
.each( function () {
$( this ).tipsy( 'enable' );
} )
.on( 'click.mmv-mp', function ( e ) {
var clickTargetIsLink = $( e.target ).is( 'a' ),
clickTargetIsTruncated = !!$( e.target ).closest( '.mw-mmv-ttf-truncated' ).length,
@ -133,9 +130,6 @@
.add( this.title.$ellipsis )
.add( this.$authorAndSource )
.add( this.creditField.$ellipsis )
.each( function () {
$( this ).tipsy( 'hide' ).tipsy( 'disable' );
} )
.off( 'click.mmv-mp' );
$( this.$container ).off( '.mmv-mp' );
@ -220,10 +214,7 @@
mw.message( 'multimediaviewer-title-popup-text-more' )
);
this.$title.add( this.title.$ellipsis ).tipsy( {
delayIn: mw.config.get( 'wgMultimediaViewer' ).tooltipDelay,
gravity: this.correctEW( 'sw' )
} );
this.$title.add( this.title.$ellipsis );
};
MPP.initializeButtons = function () {
@ -277,10 +268,7 @@
mw.message( 'multimediaviewer-credit-popup-text-more' )
);
this.$authorAndSource.add( this.creditField.$ellipsis ).tipsy( {
delayIn: mw.config.get( 'wgMultimediaViewer' ).tooltipDelay,
gravity: this.correctEW( 'sw' )
} );
this.$authorAndSource.add( this.creditField.$ellipsis );
};
/**
@ -660,11 +648,7 @@
// * multimediaviewer-restriction-trademarked
// * multimediaviewer-restriction-default
// * multimediaviewer-restriction-default-and-others
.prop( 'title', mw.message( 'multimediaviewer-restriction-' + type ).text() )
.tipsy( {
delay: mw.config.get( 'wgMultimediaViewer' ).tooltipDelay,
gravity: this.correctEW( 'se' )
} );
.prop( 'title', mw.message( 'multimediaviewer-restriction-' + type ).text() );
$( '<span>' )
// The following classes are used here: