mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-09-23 18:30:11 +00:00
[cleanup] Fix eslint (new version) warnings
Bug: T245930 Change-Id: I7a62e5a0a90ce0f4e4385afdae1e57722bc9ac82
This commit is contained in:
parent
e915f865bb
commit
72636057d8
|
@ -107,22 +107,22 @@
|
|||
|
||||
return deferred.promise()
|
||||
.then(
|
||||
function ( viewer ) {
|
||||
function ( viewer2 ) {
|
||||
if ( !bs.viewerInitialized ) {
|
||||
if ( bs.thumbs.length ) {
|
||||
viewer.initWithThumbs( bs.thumbs );
|
||||
viewer2.initWithThumbs( bs.thumbs );
|
||||
}
|
||||
|
||||
bs.viewerInitialized = true;
|
||||
}
|
||||
return viewer;
|
||||
return viewer2;
|
||||
},
|
||||
function ( message ) {
|
||||
mw.log.warn( message );
|
||||
function ( message2 ) {
|
||||
mw.log.warn( message2 );
|
||||
bs.cleanupOverlay();
|
||||
bs.viewerIsBroken = true;
|
||||
mw.notify( 'Error loading MediaViewer: ' + message );
|
||||
return $.Deferred().reject( message );
|
||||
mw.notify( 'Error loading MediaViewer: ' + message2 );
|
||||
return $.Deferred().reject( message2 );
|
||||
}
|
||||
);
|
||||
};
|
||||
|
|
|
@ -213,10 +213,10 @@
|
|||
|
||||
this.fetchThumbnailForLightboxImage(
|
||||
image, imageWidths.real
|
||||
).then( function ( thumbnail, image ) {
|
||||
).then( function ( thumbnail, image2 ) {
|
||||
// eslint-disable-next-line mediawiki/class-doc
|
||||
image.className = ext;
|
||||
viewer.setImage( ui, thumbnail, image, imageWidths );
|
||||
image2.className = ext;
|
||||
viewer.setImage( ui, thumbnail, image2, imageWidths );
|
||||
}, function ( error ) {
|
||||
viewer.ui.canvas.showError( error );
|
||||
} );
|
||||
|
|
|
@ -679,7 +679,22 @@
|
|||
MPP.createRestriction = function ( type ) {
|
||||
var $label = $( '<span>' )
|
||||
.addClass( 'mw-mmv-label mw-mmv-restriction-label' )
|
||||
// Messages documented above
|
||||
// Messages duplicated from above for linter
|
||||
// * multimediaviewer-restriction-2257
|
||||
// * multimediaviewer-restriction-aus-reserve
|
||||
// * multimediaviewer-restriction-communist
|
||||
// * multimediaviewer-restriction-costume
|
||||
// * multimediaviewer-restriction-currency
|
||||
// * multimediaviewer-restriction-design
|
||||
// * multimediaviewer-restriction-fan-art
|
||||
// * multimediaviewer-restriction-ihl
|
||||
// * multimediaviewer-restriction-insignia
|
||||
// * multimediaviewer-restriction-ita-mibac
|
||||
// * multimediaviewer-restriction-nazi
|
||||
// * multimediaviewer-restriction-personality
|
||||
// * 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,
|
||||
|
|
|
@ -120,13 +120,13 @@
|
|||
assert.ok( true, 'Image was pretend-loaded' );
|
||||
done2();
|
||||
} )
|
||||
.progress( function ( response, percent ) {
|
||||
.progress( function ( response2, percent ) {
|
||||
if ( i === 0 ) {
|
||||
assert.strictEqual( percent, 50, 'Correctly propagated a 50% progress event' );
|
||||
assert.strictEqual( response, response, 'Partial response propagated' );
|
||||
assert.strictEqual( response2, response2, 'Partial response propagated' );
|
||||
} else if ( i === 1 ) {
|
||||
assert.strictEqual( percent, 100, 'Correctly propagated a 100% progress event' );
|
||||
assert.strictEqual( response, response, 'Partial response propagated' );
|
||||
assert.strictEqual( response2, response2, 'Partial response propagated' );
|
||||
} else {
|
||||
assert.ok( false, 'Only 2 progress events should propagate' );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue