jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364414 )
Change subject: Move data pos attr to PointerView
......................................................................
Move data pos attr to PointerView
Change-Id: I46c3dceaddae84b279625caec3349aa10d931048
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.Pointer.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.SliderView.js
4 files changed, 13 insertions(+), 21 deletions(-)
Approvals:
jenkins-bot: Verified
Andrew-WMDE: Looks good to me, approved
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index 2c8f6f6..cb4712a 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -200,7 +200,6 @@
sliderView.resetRevisionStylesBasedOnPointerPosition(
sliderView.$element.find(
'div.mw-revslider-revisions' )
);
- sliderView.updatePointerPositionAttributes();
self.refresh( event.state.diff,
event.state.oldid );
} );
},
diff --git a/modules/ext.RevisionSlider.Pointer.js
b/modules/ext.RevisionSlider.Pointer.js
index 3f53e88..8388e3a 100644
--- a/modules/ext.RevisionSlider.Pointer.js
+++ b/modules/ext.RevisionSlider.Pointer.js
@@ -31,6 +31,7 @@
*/
setPosition: function ( p ) {
this.position = p;
+ this.getView().setDataPositionAttribute( p );
},
/**
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index 6e2db5f..49774c1 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -75,6 +75,18 @@
},
/**
+ * Sets the HTML attribute for the position
+ *
+ * @param {number} pos
+ */
+ setDataPositionAttribute: function ( pos ) {
+ if ( this.getElement() === null ) {
+ this.initialize();
+ }
+ this.getElement().attr( 'data-pos', pos );
+ },
+
+ /**
* Moves the pointer to a position
*
* @param {number} posInPx
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index ce35d6d..7611310 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -294,7 +294,6 @@
$clickedRev = this.getRevElementAtPosition( $revisions,
pos );
pointerMoved.setPosition( pos );
- this.updatePointerPositionAttributes();
if ( $line.hasClass(
'mw-revslider-pointer-container-newer' ) ) {
this.refreshRevisions(
$clickedRev.attr( 'data-revid' ),
@@ -344,14 +343,12 @@
self.removePointerDragCursor();
if ( self.escapePressed ) {
-
self.updatePointerPositionAttributes();
self.resetSliderLines();
return;
}
mw.track(
'counter.MediaWiki.RevisionSlider.event.pointerMove' );
pointer.setPosition(
self.slider.getOldestVisibleRevisionIndex() + relativeIndex );
- self.updatePointerPositionAttributes();
self.resetSliderLines();
self.resetRevisionStylesBasedOnPointerPosition( $revisions );
@@ -490,7 +487,6 @@
this.resetRevisionStylesBasedOnPointerPosition(
this.$element.find(
'div.mw-revslider-revisions' )
);
- this.updatePointerPositionAttributes();
this.refreshRevisions(
$( '.mw-revslider-revision[data-pos="' +
this.getNewerPointerPos() + '"]' ).attr( 'data-revid' ),
$( '.mw-revslider-revision[data-pos="' +
this.getOlderPointerPos() + '"]' ).attr( 'data-revid' )
@@ -547,7 +543,6 @@
}
this.setNewerPointerPos( $newRevElement.data( 'pos' ) );
this.resetSliderLines();
- this.updatePointerPositionAttributes();
},
/**
@@ -629,21 +624,6 @@
this.getRevElementAtPosition( $revisions,
positionIndex ).addClass( 'mw-revslider-revision-intermediate' );
positionIndex++;
}
- },
-
- /**
- * Updates value of pointers' position data attribute
- */
- updatePointerPositionAttributes: function () {
- this.pointerNewer.getView().getElement().attr(
- 'data-pos',
- this.getNewerPointerPos()
- );
-
- this.pointerOlder.getView().getElement().attr(
- 'data-pos',
- this.getOlderPointerPos()
- );
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/364414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46c3dceaddae84b279625caec3349aa10d931048
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
