WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363158 )
Change subject: Merge/rename resetSliderLines and dependencies
......................................................................
Merge/rename resetSliderLines and dependencies
Change-Id: I52ac8b42e39b3a37c0bac6b7fff5a676d7c2ecfe
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.SliderViewTwo.js
3 files changed, 75 insertions(+), 82 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/58/363158/1
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index 7145d20..2c8f6f6 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -196,7 +196,7 @@
sliderView.pointerNewer.setPosition(
event.state.pointerNewerPos );
sliderView.slider.setFirstVisibleRevisionIndex(
event.state.sliderPos );
sliderView.slide( 0 );
- sliderView.resetPointerStylesBasedOnPosition();
+ sliderView.resetSliderLines();
sliderView.resetRevisionStylesBasedOnPointerPosition(
sliderView.$element.find(
'div.mw-revslider-revisions' )
);
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 6b568da..a400dda 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -236,14 +236,14 @@
if ( self.escapePressed ) {
self.updatePointerPositionAttributes();
-
self.resetPointerStylesBasedOnPosition();
+ self.resetSliderLines();
return;
}
mw.track(
'counter.MediaWiki.RevisionSlider.event.pointerMove' );
pointer.setPosition(
self.slider.getOldestVisibleRevisionIndex() + relativeIndex );
self.updatePointerPositionAttributes();
-
self.resetPointerStylesBasedOnPosition();
+ self.resetSliderLines();
self.resetRevisionStylesBasedOnPointerPosition( $revisions );
diff = self.getRevElementAtPosition(
@@ -417,7 +417,7 @@
resetAndRefreshRevisions: function () {
this.slide( 0 );
- this.resetPointerStylesBasedOnPosition();
+ this.resetSliderLines();
this.resetRevisionStylesBasedOnPointerPosition(
this.$element.find(
'div.mw-revslider-revisions' )
);
@@ -477,7 +477,7 @@
this.pointerOlder.setPosition( -1 );
}
this.pointerNewer.setPosition( $newRevElement.data(
'pos' ) );
- this.resetPointerStylesBasedOnPosition();
+ this.resetSliderLines();
this.updatePointerPositionAttributes();
},
@@ -499,13 +499,63 @@
},
/**
- * Resets the pointer styles (upper/lower, blue/yellow) based
on their position.
+ * Resets the slider lines based on the selected revisions
*/
- resetPointerStylesBasedOnPosition: function () {
-
this.getNewRevPointer().getView().getElement().removeClass(
'mw-revslider-pointer-oldid' ).addClass( 'mw-revslider-pointer-newid' )
- .removeClass( 'mw-revslider-pointer-lower'
).addClass( 'mw-revslider-pointer-upper' );
-
this.getOldRevPointer().getView().getElement().removeClass(
'mw-revslider-pointer-newid' ).addClass( 'mw-revslider-pointer-oldid' )
- .removeClass( 'mw-revslider-pointer-upper'
).addClass( 'mw-revslider-pointer-lower' );
+ resetSliderLines: function () {
+ this.updateOlderSliderLineCSS();
+ this.updateNewerSliderLineCSS();
+ },
+
+ updateOlderSliderLineCSS: function () {
+ var widthToSet = ( this.getOlderDistanceToOldest() +
this.getDistanceBetweenPointers() ) *
+ this.revisionWidth,
+ marginToSet = -this.revisionWidth / 2;
+
+ widthToSet = Math.min( widthToSet,
this.calculateSliderContainerWidth() + this.revisionWidth );
+
+ this.setSliderLineCSS(
+ $( '.mw-revslider-pointer-container-older' ),
widthToSet, marginToSet
+ );
+ },
+
+ updateNewerSliderLineCSS: function () {
+ var widthToSet = ( this.getNewerDistanceToNewest() +
this.getDistanceBetweenPointers() + 2 ) *
+ this.revisionWidth,
+ marginToSet = ( this.getOlderDistanceToOldest()
* this.revisionWidth ) -
+ this.revisionWidth / 2;
+
+ widthToSet = Math.min( widthToSet,
this.calculateSliderContainerWidth() + this.revisionWidth );
+ marginToSet = Math.max( marginToSet, -0.5 *
this.revisionWidth );
+
+ this.setSliderLineCSS(
+ $( '.mw-revslider-pointer-container-newer' ),
widthToSet, marginToSet
+ );
+ },
+
+ setSliderLineCSS: function ( $lineContainer, widthToSet,
marginToSet ) {
+ if ( this.dir === 'ltr' ) {
+ $lineContainer.css( {
+ width: widthToSet,
+ 'margin-left': marginToSet
+ } );
+ } else {
+ $lineContainer.css( {
+ width: widthToSet,
+ 'margin-right': marginToSet +
this.revisionWidth
+ } );
+ }
+ },
+
+ getOlderDistanceToOldest: function () {
+ return this.pointerOlder.getPosition() -
this.slider.getOldestVisibleRevisionIndex();
+ },
+
+ getNewerDistanceToNewest: function () {
+ return this.slider.getNewestVisibleRevisionIndex() -
this.pointerNewer.getPosition();
+ },
+
+ getDistanceBetweenPointers: function () {
+ return this.pointerNewer.getPosition() -
this.pointerOlder.getPosition();
},
/**
@@ -684,13 +734,13 @@
this.pointerOlder.getView()
.slideToSideOrPosition( this.slider, duration )
.promise().done( function () {
-
self.resetPointerStylesBasedOnPosition();
+ self.resetSliderLines();
self.redrawPointerLines();
} );
this.pointerNewer.getView()
.slideToSideOrPosition( this.slider, duration )
.promise().done( function () {
-
self.resetPointerStylesBasedOnPosition();
+ self.resetSliderLines();
self.redrawPointerLines();
} );
},
diff --git a/modules/ext.RevisionSlider.SliderViewTwo.js
b/modules/ext.RevisionSlider.SliderViewTwo.js
index 80115b2..604a90d 100644
--- a/modules/ext.RevisionSlider.SliderViewTwo.js
+++ b/modules/ext.RevisionSlider.SliderViewTwo.js
@@ -103,19 +103,19 @@
'.mw-revslider-pointer-container-newer'
) );
- $pointerNewer.on(
- 'touchstart touchmove touchend touchcancel
touchleave',
- mw.libs.revisionSlider.touchEventConverter
- );
- $pointerOlder.on(
- 'touchstart touchmove touchend touchcancel
touchleave',
- mw.libs.revisionSlider.touchEventConverter
- );
-
-
SliderViewTwo.super.prototype.resetPointerStylesBasedOnPosition.call( this );
+ $pointerNewer
+ .on(
+ 'touchstart touchmove touchend
touchcancel touchleave',
+
mw.libs.revisionSlider.touchEventConverter
+ )
+ .addClass( 'mw-revslider-pointer-newid
mw-revslider-pointer-upper' );
+ $pointerOlder
+ .on(
+ 'touchstart touchmove touchend
touchcancel touchleave',
+
mw.libs.revisionSlider.touchEventConverter
+ )
+ .addClass( 'mw-revslider-pointer-oldid
mw-revslider-pointer-lower' );
},
-
-
setPointerDragCursor: function () {
$( '.mw-revslider-pointer, ' +
@@ -187,64 +187,7 @@
this.alignPointers();
},
- resetPointerStylesBasedOnPosition: function () {
- this.updateOlderSliderLineCSS();
- this.updateNewerSliderLineCSS();
- },
-
resetPointerColorsBasedOnValues: function () {
- },
-
- updateOlderSliderLineCSS: function () {
- var widthToSet = ( this.getOlderDistanceToOldest() +
this.getDistanceBetweenPointers() ) *
- this.revisionWidth,
- marginToSet = -this.revisionWidth / 2;
-
- widthToSet = Math.min( widthToSet,
this.calculateSliderContainerWidth() + this.revisionWidth );
-
- this.setSliderLineCSS(
- $( '.mw-revslider-pointer-container-older' ),
widthToSet, marginToSet
- );
- },
-
- updateNewerSliderLineCSS: function () {
- var widthToSet = ( this.getNewerDistanceToNewest() +
this.getDistanceBetweenPointers() + 2 ) *
- this.revisionWidth,
- marginToSet = ( this.getOlderDistanceToOldest()
* this.revisionWidth ) -
- this.revisionWidth / 2;
-
- widthToSet = Math.min( widthToSet,
this.calculateSliderContainerWidth() + this.revisionWidth );
- marginToSet = Math.max( marginToSet, -0.5 *
this.revisionWidth );
-
- this.setSliderLineCSS(
- $( '.mw-revslider-pointer-container-newer' ),
widthToSet, marginToSet
- );
- },
-
- setSliderLineCSS: function ( $lineContainer, widthToSet,
marginToSet ) {
- if ( this.dir === 'ltr' ) {
- $lineContainer.css( {
- width: widthToSet,
- 'margin-left': marginToSet
- } );
- } else {
- $lineContainer.css( {
- width: widthToSet,
- 'margin-right': marginToSet +
this.revisionWidth
- } );
- }
- },
-
- getOlderDistanceToOldest: function () {
- return this.pointerOlder.getPosition() -
this.slider.getOldestVisibleRevisionIndex();
- },
-
- getNewerDistanceToNewest: function () {
- return this.slider.getNewestVisibleRevisionIndex() -
this.pointerNewer.getPosition();
- },
-
- getDistanceBetweenPointers: function () {
- return this.pointerNewer.getPosition() -
this.pointerOlder.getPosition();
},
revisionWrapperClickHandler: function () {
--
To view, visit https://gerrit.wikimedia.org/r/363158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52ac8b42e39b3a37c0bac6b7fff5a676d7c2ecfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
