jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363160 )
Change subject: Merge remaining pointer methods
......................................................................
Merge remaining pointer methods
Change-Id: I89562e445481b9785cf18e02ea02040105632af7
---
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.SliderViewTwo.js
2 files changed, 14 insertions(+), 45 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index fb9e1fa..f138c0f 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -410,13 +410,23 @@
},
setPointerDragCursor: function () {
- $( '.mw-revslider-revision-wrapper' )
- .addClass( 'mw-revslider-pointer-cursor' );
+ $( '.mw-revslider-pointer, ' +
+ '.mw-revslider-pointer-container, ' +
+ '.mw-revslider-pointer-container-newer, ' +
+ '.mw-revslider-pointer-container-older, ' +
+ '.mw-revslider-pointer-line, ' +
+ '.mw-revslider-revision-wrapper' )
+ .addClass( 'mw-revslider-pointer-grabbing' );
},
removePointerDragCursor: function () {
- $( '.mw-revslider-revision-wrapper' )
- .removeClass( 'mw-revslider-pointer-cursor' );
+ $( '.mw-revslider-pointer, ' +
+ '.mw-revslider-pointer-container, ' +
+ '.mw-revslider-pointer-container-newer, ' +
+ '.mw-revslider-pointer-container-older, ' +
+ '.mw-revslider-pointer-line, ' +
+ '.mw-revslider-revision-wrapper' )
+ .removeClass( 'mw-revslider-pointer-grabbing' );
},
/**
@@ -471,7 +481,6 @@
);
}
- view.resetPointerColorsBasedOnValues(
view.pointerOlder.getPosition(), view.pointerNewer.getPosition() );
view.resetRevisionStylesBasedOnPointerPosition(
$revisions );
view.alignPointers();
},
@@ -581,23 +590,6 @@
this.pointerNewer.setPosition( $newRevElement.data(
'pos' ) );
this.resetSliderLines();
this.updatePointerPositionAttributes();
- },
-
- /**
- * Adjusts the colors of the pointers without changing the
upper/lower property based on values `p1` and `p2`.
- * Used e.g. when pointers get dragged past one another.
- *
- * @param {number} p1
- * @param {number} p2
- */
- resetPointerColorsBasedOnValues: function ( p1, p2 ) {
- if ( p1 > p2 ) {
-
this.pointerOlder.getView().getElement().removeClass(
'mw-revslider-pointer-oldid' ).addClass( 'mw-revslider-pointer-newid' );
-
this.pointerNewer.getView().getElement().removeClass(
'mw-revslider-pointer-newid' ).addClass( 'mw-revslider-pointer-oldid' );
- } else {
-
this.pointerOlder.getView().getElement().removeClass(
'mw-revslider-pointer-newid' ).addClass( 'mw-revslider-pointer-oldid' );
-
this.pointerNewer.getView().getElement().removeClass(
'mw-revslider-pointer-oldid' ).addClass( 'mw-revslider-pointer-newid' );
- }
},
/**
diff --git a/modules/ext.RevisionSlider.SliderViewTwo.js
b/modules/ext.RevisionSlider.SliderViewTwo.js
index 5817f22..049cbd5 100644
--- a/modules/ext.RevisionSlider.SliderViewTwo.js
+++ b/modules/ext.RevisionSlider.SliderViewTwo.js
@@ -14,29 +14,6 @@
$.extend( SliderViewTwo.prototype, {
- setPointerDragCursor: function () {
- $( '.mw-revslider-pointer, ' +
- '.mw-revslider-pointer-container, ' +
- '.mw-revslider-pointer-container-newer, ' +
- '.mw-revslider-pointer-container-older, ' +
- '.mw-revslider-pointer-line, ' +
- '.mw-revslider-revision-wrapper' )
- .addClass( 'mw-revslider-pointer-grabbing' );
- },
-
- removePointerDragCursor: function () {
- $( '.mw-revslider-pointer, ' +
- '.mw-revslider-pointer-container, ' +
- '.mw-revslider-pointer-container-newer, ' +
- '.mw-revslider-pointer-container-older, ' +
- '.mw-revslider-pointer-line, ' +
- '.mw-revslider-revision-wrapper' )
- .removeClass( 'mw-revslider-pointer-grabbing' );
- },
-
- resetPointerColorsBasedOnValues: function () {
- },
-
revisionWrapperClickHandler: function () {
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/363160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89562e445481b9785cf18e02ea02040105632af7
Gerrit-PatchSet: 2
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
