jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344987 )
Change subject: Renamed firstVisibleRevision to oldestVisibleRevison
......................................................................
Renamed firstVisibleRevision to oldestVisibleRevison
The meaning of first in this context was totally unclear and not
very usefull. It turns out, that the "first" revision is always
the oldest and the last is always the newest revision.
Change-Id: I009438777908a5f4a8833f8f5cb7d3041057741c
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.Slider.js
M modules/ext.RevisionSlider.SliderView.js
M tests/qunit/RevisionSlider.Slider.test.js
5 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index cf34c65..279362f 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -144,7 +144,7 @@
revid2: revId2,
pointerOlderPos:
sliderView.pointerOlder.getPosition(),
pointerNewerPos:
sliderView.pointerNewer.getPosition(),
- sliderPos:
sliderView.slider.getFirstVisibleRevisionIndex()
+ sliderPos:
sliderView.slider.getOldestVisibleRevisionIndex()
};
},
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index e23405a..9d3a6e7 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -99,7 +99,7 @@
* @return {jQuery}
*/
slideToPosition: function ( slider, duration ) {
- var relativePos = this.pointer.getPosition() -
slider.getFirstVisibleRevisionIndex();
+ var relativePos = this.pointer.getPosition() -
slider.getOldestVisibleRevisionIndex();
return this.animateTo( ( relativePos - 1 ) *
slider.getView().revisionWidth, duration );
},
@@ -127,7 +127,7 @@
* @return {jQuery}
*/
slideToSideOrPosition: function ( slider, duration ) {
- var firstVisibleRev =
slider.getFirstVisibleRevisionIndex(),
+ var firstVisibleRev =
slider.getOldestVisibleRevisionIndex(),
posBeforeSlider = this.pointer.getPosition() <
firstVisibleRev,
isVisible = !posBeforeSlider &&
this.pointer.getPosition() <= firstVisibleRev + slider.getRevisionsPerWindow();
if ( isVisible ) {
diff --git a/modules/ext.RevisionSlider.Slider.js
b/modules/ext.RevisionSlider.Slider.js
index 954508c..5bf7818 100644
--- a/modules/ext.RevisionSlider.Slider.js
+++ b/modules/ext.RevisionSlider.Slider.js
@@ -19,7 +19,7 @@
/**
* @type {number}
*/
- firstVisibleRevisionIndex: 0,
+ oldestVisibleRevisionIndex: 0,
/**
* @type {number}
@@ -62,35 +62,35 @@
},
/**
- * Returns the index of the first revision that is visible in
the current window
+ * Returns the index of the oldest revision that is visible in
the current window
*
* @return {number}
*/
- getFirstVisibleRevisionIndex: function () {
- return this.firstVisibleRevisionIndex;
+ getOldestVisibleRevisionIndex: function () {
+ return this.oldestVisibleRevisionIndex;
},
/**
- * Returns the index of the last revision that is visible in
the current window
+ * Returns the index of the newest revision that is visible in
the current window
*
* @return {number}
*/
- getLastVisibleRevisionIndex: function () {
- return this.firstVisibleRevisionIndex +
this.revisionsPerWindow - 1;
+ getNewestVisibleRevisionIndex: function () {
+ return this.oldestVisibleRevisionIndex +
this.revisionsPerWindow - 1;
},
/**
* @return {boolean}
*/
isAtStart: function () {
- return this.getFirstVisibleRevisionIndex() === 0 ||
this.revisions.getLength() <= this.revisionsPerWindow;
+ return this.getOldestVisibleRevisionIndex() === 0 ||
this.revisions.getLength() <= this.revisionsPerWindow;
},
/**
* @return {boolean}
*/
isAtEnd: function () {
- return this.getLastVisibleRevisionIndex() ===
this.revisions.getLength() - 1 || this.revisions.getLength() <=
this.revisionsPerWindow;
+ return this.getNewestVisibleRevisionIndex() ===
this.revisions.getLength() - 1 || this.revisions.getLength() <=
this.revisionsPerWindow;
},
/**
@@ -99,20 +99,20 @@
* @param {number} value
*/
setFirstVisibleRevisionIndex: function ( value ) {
- this.firstVisibleRevisionIndex = value;
+ this.oldestVisibleRevisionIndex = value;
},
/**
- * Sets the new firstVisibleRevisionIndex after sliding in a
direction
+ * Sets the new oldestVisibleRevisionIndex after sliding in a
direction
*
* @param {number} direction - Either -1 or 1
*/
slide: function ( direction ) {
var highestPossibleFirstRev =
this.revisions.getLength() - this.revisionsPerWindow;
- this.firstVisibleRevisionIndex += direction *
this.revisionsPerWindow;
- this.firstVisibleRevisionIndex = Math.min(
this.firstVisibleRevisionIndex, highestPossibleFirstRev );
- this.firstVisibleRevisionIndex = Math.max( 0,
this.firstVisibleRevisionIndex );
+ this.oldestVisibleRevisionIndex += direction *
this.revisionsPerWindow;
+ this.oldestVisibleRevisionIndex = Math.min(
this.oldestVisibleRevisionIndex, highestPossibleFirstRev );
+ this.oldestVisibleRevisionIndex = Math.max( 0,
this.oldestVisibleRevisionIndex );
}
} );
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index cab8df7..df83dd3 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -227,7 +227,7 @@
}
mw.track(
'counter.MediaWiki.RevisionSlider.event.pointerMove' );
- pointer.setPosition(
self.slider.getFirstVisibleRevisionIndex() + relativeIndex );
+ pointer.setPosition(
self.slider.getOldestVisibleRevisionIndex() + relativeIndex );
self.updatePointerPositionAttributes();
self.resetPointerStylesBasedOnPosition();
self.resetRevisionStylesBasedOnPointerPosition( $revisions );
@@ -685,7 +685,7 @@
this.forwardArrowButton.setDisabled( false );
}
- animateObj = { scrollLeft:
this.slider.getFirstVisibleRevisionIndex() * this.revisionWidth };
+ animateObj = { scrollLeft:
this.slider.getOldestVisibleRevisionIndex() * this.revisionWidth };
if ( this.dir === 'rtl' ) {
animateObj.scrollLeft = this.getRtlScrollLeft(
$animatedElement, animateObj.scrollLeft );
}
@@ -942,13 +942,13 @@
this.resetRevisionStylesBasedOnPointerPosition(
$slider );
}
- this.slider.setFirstVisibleRevisionIndex(
this.slider.getFirstVisibleRevisionIndex() + revisionsToRender.getLength() );
+ this.slider.setFirstVisibleRevisionIndex(
this.slider.getOldestVisibleRevisionIndex() + revisionsToRender.getLength() );
revIdOld = self.getRevElementAtPosition( $revisions,
pOld.getPosition() ).data( 'revid' );
revIdNew = self.getRevElementAtPosition( $revisions,
pNew.getPosition() ).data( 'revid' );
this.diffPage.replaceState( revIdOld, revIdNew, this );
- scrollLeft = this.slider.getFirstVisibleRevisionIndex()
* this.revisionWidth;
+ scrollLeft =
this.slider.getOldestVisibleRevisionIndex() * this.revisionWidth;
$revisionContainer.scrollLeft( scrollLeft );
if ( this.dir === 'rtl' ) {
$revisionContainer.scrollLeft(
self.getRtlScrollLeft( $revisionContainer, scrollLeft ) );
diff --git a/tests/qunit/RevisionSlider.Slider.test.js
b/tests/qunit/RevisionSlider.Slider.test.js
index 68430ef..aa51f34 100644
--- a/tests/qunit/RevisionSlider.Slider.test.js
+++ b/tests/qunit/RevisionSlider.Slider.test.js
@@ -26,32 +26,32 @@
QUnit.test( 'Given no revisions, first visible revision index is 0',
function ( assert ) {
var slider = new Slider( makeNRevisions( 0 ) );
- assert.equal( slider.getFirstVisibleRevisionIndex(), 0 );
+ assert.equal( slider.getOldestVisibleRevisionIndex(), 0 );
} );
- QUnit.test( 'Given 200 revisions sliding once increases
firstVisibleRevisionIndex by the number of revisions per window', function (
assert ) {
+ QUnit.test( 'Given 200 revisions sliding once increases
oldestVisibleRevisionIndex by the number of revisions per window', function (
assert ) {
var slider = new Slider( makeNRevisions( 200 ) );
slider.setRevisionsPerWindow( 50 );
slider.slide( 1 );
- assert.equal( slider.getFirstVisibleRevisionIndex(), 50 );
+ assert.equal( slider.getOldestVisibleRevisionIndex(), 50 );
} );
- QUnit.test( 'firstVisibleRevisionIndex cannot be higher than
revisions.length - revisionsPerWindow', function ( assert ) {
+ QUnit.test( 'oldestVisibleRevisionIndex cannot be higher than
revisions.length - revisionsPerWindow', function ( assert ) {
var slider = new Slider( makeNRevisions( 75 ) );
slider.setRevisionsPerWindow( 50 );
slider.slide( 1 );
- assert.equal( slider.getFirstVisibleRevisionIndex(), 25 );
+ assert.equal( slider.getOldestVisibleRevisionIndex(), 25 );
} );
- QUnit.test( 'firstVisibleRevisionIndex cannot be lower than 0',
function ( assert ) {
+ QUnit.test( 'oldestVisibleRevisionIndex cannot be lower than 0',
function ( assert ) {
var slider = new Slider( makeNRevisions( 50 ) );
- slider.firstVisibleRevisionIndex = 10;
+ slider.oldestVisibleRevisionIndex = 10;
slider.setRevisionsPerWindow( 20 );
slider.slide( -1 );
- assert.equal( slider.getFirstVisibleRevisionIndex(), 0 );
+ assert.equal( slider.getOldestVisibleRevisionIndex(), 0 );
} );
}( mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/344987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I009438777908a5f4a8833f8f5cb7d3041057741c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Jakob <jakob.warkot...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
