wikimedia/mediawiki-extensions-RevisionSlider
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/RevisionSlider synced 2024-11-15 03:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adjust sliding animation time of pointers on short distances"

Browse source
This commit is contained in:
jenkins-bot 2018-05-28 13:35:24 +00:00 committed by Gerrit Code Review
parent 3ca26c9683 16163b4964
commit 4197c50c28
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/ext.RevisionSlider.PointerView.js
View file

@ -90,27 +90,33 @@
* Moves the pointer to a position * Moves the pointer to a position
* *
* @param {number} posInPx * @param {number} posInPx
* @param {number|string} duration * @param {number} baseDuration - duration per revisionWidth, is adjusted by square root distance
* @param {number} revisionWidth
* @return {jQuery} * @return {jQuery}
*/ */
animateTo: function ( posInPx, duration ) { animateTo: function ( posInPx, baseDuration, revisionWidth ) {
var animatePos = { left: posInPx }; var animatePos = { left: posInPx },
currentPos = this.getElement().position(),
distance, duration;
baseDuration = typeof baseDuration !== 'undefined' ? baseDuration : 100;
if ( this.getElement().css( 'direction' ) === 'rtl' ) { if ( this.getElement().css( 'direction' ) === 'rtl' ) {
animatePos.left = this.getAdjustedLeftPositionWhenRtl( animatePos.left ); animatePos.left = this.getAdjustedLeftPositionWhenRtl( animatePos.left );
} }
return this.getElement().animate( animatePos, duration ); distance = Math.abs( animatePos.left - currentPos.left ) / revisionWidth;
duration = baseDuration * Math.log( 5 + distance );
return this.getElement().animate( animatePos, duration, 'linear' );
}, },
/** /**
* Slides the pointer to the revision it's pointing at * Slides the pointer to the revision it's pointing at
* *
* @param {Slider} slider * @param {Slider} slider
* @param {number|string} duration * @param {number} duration
* @return {jQuery} * @return {jQuery}
*/ */
slideToPosition: function ( slider, duration ) { slideToPosition: function ( slider, duration ) {
var relativePos = this.pointer.getPosition() - slider.getOldestVisibleRevisionIndex(); var relativePos = this.pointer.getPosition() - slider.getOldestVisibleRevisionIndex();
return this.animateTo( ( relativePos - 1 ) * slider.getView().revisionWidth, duration ); return this.animateTo( ( relativePos - 1 ) * slider.getView().revisionWidth, duration, slider.getView().revisionWidth );
}, },
/** /**
@ -118,14 +124,14 @@
* *
* @param {Slider} slider * @param {Slider} slider
* @param {boolean} posBeforeSlider * @param {boolean} posBeforeSlider
* @param {number|string} duration * @param {number} duration
* @return {jQuery} * @return {jQuery}
*/ */
slideToSide: function ( slider, posBeforeSlider, duration ) { slideToSide: function ( slider, posBeforeSlider, duration ) {
if ( posBeforeSlider ) { if ( posBeforeSlider ) {
return this.animateTo( this.getOffset() - 2 * slider.getView().revisionWidth, duration ); return this.animateTo( this.getOffset() - 2 * slider.getView().revisionWidth, duration, slider.getView().revisionWidth );
} else { } else {
return this.animateTo( slider.getRevisionsPerWindow() * slider.getView().revisionWidth + this.getOffset(), duration ); return this.animateTo( slider.getRevisionsPerWindow() * slider.getView().revisionWidth + this.getOffset(), duration, slider.getView().revisionWidth );
} }
}, },
@ -133,7 +139,7 @@
* Decides based on its position whether the pointer should be sliding to the side or to its position * Decides based on its position whether the pointer should be sliding to the side or to its position
* *
* @param {Slider} slider * @param {Slider} slider
* @param {number|string} duration * @param {number} duration
* @return {jQuery} * @return {jQuery}
*/ */
slideToSideOrPosition: function ( slider, duration ) { slideToSideOrPosition: function ( slider, duration ) {