wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-24 16:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor animation, plus test

Browse source 
Change-Id: I688c573b7fbd136782177f0b690d3aab994c6d10
This commit is contained in:
Mark Holmquist 2014-01-07 11:58:29 -08:00
parent 29b1efe9b8
commit 9b28edb1be
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/ext.multimediaViewer/ext.multimediaViewer.js
View file

@ -608,9 +608,7 @@
imageEle = new Image(), imageEle = new Image(),
targetWidth = size; targetWidth = size;
if ( !viewer.hasAnimatedMetadata ) { viewer.animateMetadataDivOnce();
viewer.animateMetadataDiv();
}
imageEle.onload = function () { imageEle.onload = function () {
if ( imageEle.width > targetWidth ) { if ( imageEle.width > targetWidth ) {
@ -639,10 +637,12 @@
comingFromPopstate = false; comingFromPopstate = false;
}; };
MMVP.animateMetadataDiv = function () { MMVP.animateMetadataDivOnce = function () {
$.scrollTo( 40, 400, { onAfter: function() { $.scrollTo( 0, 400 ); } } ); if ( !this.hasAnimatedMetadata ) {
$.scrollTo( 40, 400, { onAfter: function() { $.scrollTo( 0, 400 ); } } );
this.hasAnimatedMetadata = true; this.hasAnimatedMetadata = true;
}
}; };
/** /**

22
tests/qunit/ext.multimediaViewer.test.js
View file

@ -255,4 +255,26 @@
assert.strictEqual( viewer.findNextHighestImageSize( 3000 ), 2880, 'The image bucketing also works on REALLY big screens' ); assert.strictEqual( viewer.findNextHighestImageSize( 3000 ), 2880, 'The image bucketing also works on REALLY big screens' );
} ); } );
QUnit.test( 'Metadata div is only animated once', 4, function ( assert ) {
var viewer = new mw.MultimediaViewer(),
backupAnimation = $.fn.animate,
animationRan = false;
$.fn.animate = function () {
animationRan = true;
return this;
};
viewer.animateMetadataDivOnce();
assert.strictEqual( viewer.hasAnimatedMetadata, true, 'The first call to animateMetadataDivOnce set hasAnimatedMetadata to true' );
assert.strictEqual( animationRan, true, 'The first call to animateMetadataDivOnce led to an animation' );
animationRan = false;
viewer.animateMetadataDivOnce();
assert.strictEqual( viewer.hasAnimatedMetadata, true, 'The second call to animateMetadataDivOnce did not change the value of hasAnimatedMetadata' );
assert.strictEqual( animationRan, false, 'The second call to animateMetadataDivOnce did not lead to an animation' );
$.fn.animate = backupAnimation;
} );
}( mediaWiki, jQuery ) ); }( mediaWiki, jQuery ) );