[MediaWiki-commits] [Gerrit] Get rid of left and right pointers. - change (mediawiki...RevisionSlider)
WMDE-leszek has submitted this change and it was merged.
Change subject: Get rid of left and right pointers.
..
Get rid of left and right pointers.
As the pointers can switch side the idea
of having a left and right one will just lead
to confusion, so lets kill that idea now! :D
Change-Id: I9d56314ea4cf46402df56e0a038bfb9655218960
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.Pointer.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.SliderView.js
M tests/RevisionSlider.Pointer.test.js
5 files changed, 53 insertions(+), 49 deletions(-)
Approvals:
WMDE-leszek: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index b8eceb2..9f0d935 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -37,7 +37,7 @@
pushState: function ( revId1, revId2, sliderView ) {
history.pushState(
- { revid1: revId1, revid2: revId2, leftPos:
sliderView.leftPointer.getPosition(), rightPos:
sliderView.rightPointer.getPosition(), sliderPos:
sliderView.slider.getFirstVisibleRevisionIndex() },
+ { revid1: revId1, revid2: revId2, leftPos:
sliderView.pointerOne.getPosition(), rightPos:
sliderView.pointerTwo.getPosition(), sliderPos:
sliderView.slider.getFirstVisibleRevisionIndex() },
$( document ).find( 'title' ).text(),
mw.util.wikiScript( 'index' ) + '?diff=' +
Math.max( revId1, revId2 ) + '=' + Math.min( revId1, revId2 )
);
@@ -50,17 +50,11 @@
return;
}
mw.track(
'counter.MediaWiki.RevisionSlider.event.historyChange' );
- sliderView.leftPointer.setPosition(
event.state.leftPos );
- sliderView.rightPointer.setPosition(
event.state.rightPos );
+ sliderView.pointerOne.setPosition(
event.state.leftPos );
+ sliderView.pointerTwo.setPosition(
event.state.rightPos );
sliderView.slider.setFirstVisibleRevisionIndex(
event.state.sliderPos );
sliderView.slide( 0 );
- if ( sliderView.leftPointer.getPosition() >
sliderView.rightPointer.getPosition() ) {
-
sliderView.leftPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
-
sliderView.rightPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
- } else {
-
sliderView.leftPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
-
sliderView.rightPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
- }
+ sliderView.resetPointerColorsBasedOnPosition();
self.refresh( event.state.revid1,
event.state.revid2 );
} );
}
diff --git a/modules/ext.RevisionSlider.Pointer.js
b/modules/ext.RevisionSlider.Pointer.js
index 0fe73ba..e581c0d 100644
--- a/modules/ext.RevisionSlider.Pointer.js
+++ b/modules/ext.RevisionSlider.Pointer.js
@@ -1,6 +1,6 @@
( function ( mw, $ ) {
- var Pointer = function ( cssClass, offset ) {
- this.view = new mw.libs.revisionSlider.PointerView( this,
cssClass, offset );
+ var Pointer = function ( id, offset ) {
+ this.view = new mw.libs.revisionSlider.PointerView( this, id,
offset );
};
$.extend( Pointer.prototype, {
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index 1b2e39e..9575b0a 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -1,7 +1,7 @@
( function ( mw, $ ) {
- var PointerView = function ( pointer, cssClass, offset ) {
+ var PointerView = function ( pointer, id, offset ) {
this.pointer = pointer;
- this.cssClass = cssClass;
+ this.id = id;
this.offset = offset;
};
@@ -9,7 +9,7 @@
/**
* @type {string}
*/
- cssClass: '',
+ id: '',
/**
* @type {int}
@@ -26,12 +26,7 @@
$html: null,
initialize: function () {
- this.$html
[MediaWiki-commits] [Gerrit] Get rid of left and right pointers. - change (mediawiki...RevisionSlider)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288588
Change subject: Get rid of left and right pointers.
..
Get rid of left and right pointers.
As the pointers can switch side the idea
of having a left and right one will just lead
to confusion, so lets kill that idea now! :D
Change-Id: I9d56314ea4cf46402df56e0a038bfb9655218960
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.Pointer.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.SliderView.js
M tests/RevisionSlider.Pointer.test.js
5 files changed, 53 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/88/288588/1
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index b8eceb2..9f0d935 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -37,7 +37,7 @@
pushState: function ( revId1, revId2, sliderView ) {
history.pushState(
- { revid1: revId1, revid2: revId2, leftPos:
sliderView.leftPointer.getPosition(), rightPos:
sliderView.rightPointer.getPosition(), sliderPos:
sliderView.slider.getFirstVisibleRevisionIndex() },
+ { revid1: revId1, revid2: revId2, leftPos:
sliderView.pointerOne.getPosition(), rightPos:
sliderView.pointerTwo.getPosition(), sliderPos:
sliderView.slider.getFirstVisibleRevisionIndex() },
$( document ).find( 'title' ).text(),
mw.util.wikiScript( 'index' ) + '?diff=' +
Math.max( revId1, revId2 ) + '=' + Math.min( revId1, revId2 )
);
@@ -50,17 +50,11 @@
return;
}
mw.track(
'counter.MediaWiki.RevisionSlider.event.historyChange' );
- sliderView.leftPointer.setPosition(
event.state.leftPos );
- sliderView.rightPointer.setPosition(
event.state.rightPos );
+ sliderView.pointerOne.setPosition(
event.state.leftPos );
+ sliderView.pointerTwo.setPosition(
event.state.rightPos );
sliderView.slider.setFirstVisibleRevisionIndex(
event.state.sliderPos );
sliderView.slide( 0 );
- if ( sliderView.leftPointer.getPosition() >
sliderView.rightPointer.getPosition() ) {
-
sliderView.leftPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
-
sliderView.rightPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
- } else {
-
sliderView.leftPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
-
sliderView.rightPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
- }
+ sliderView.resetPointerColorsBasedOnPosition();
self.refresh( event.state.revid1,
event.state.revid2 );
} );
}
diff --git a/modules/ext.RevisionSlider.Pointer.js
b/modules/ext.RevisionSlider.Pointer.js
index 0fe73ba..e581c0d 100644
--- a/modules/ext.RevisionSlider.Pointer.js
+++ b/modules/ext.RevisionSlider.Pointer.js
@@ -1,6 +1,6 @@
( function ( mw, $ ) {
- var Pointer = function ( cssClass, offset ) {
- this.view = new mw.libs.revisionSlider.PointerView( this,
cssClass, offset );
+ var Pointer = function ( id, offset ) {
+ this.view = new mw.libs.revisionSlider.PointerView( this, id,
offset );
};
$.extend( Pointer.prototype, {
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index 1b2e39e..9575b0a 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -1,7 +1,7 @@
( function ( mw, $ ) {
- var PointerView = function ( pointer, cssClass, offset ) {
+ var PointerView = function ( pointer, id, offset ) {
this.pointer = pointer;
- this.cssClass = cssClass;
+ this.id = id;
this.offset = offset;
};
@@ -9,7 +9,7 @@
/**
* @type {string}
*/
- cssClass: '',
+ id: '',
/**
* @type {int}
@@ -26,12 +26,7 @@
$html: null,
initialize:
