WMDE-leszek has submitted this change and it was merged.
Change subject: Map pointer colors to diff colours
......................................................................
Map pointer colors to diff colours
The need for left-pointer and right-pointer should be cleaned up at
some stage.
Infact It may be wise to loose the distinction between left and right
pointer and simply have 2 pointers.
Bug: T134994
Change-Id: I68a2159bde6fff969ca54a79587cfe03ed783454
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.css
4 files changed, 27 insertions(+), 4 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 ff3e2bc..b8eceb2 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -54,6 +54,13 @@
sliderView.rightPointer.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' );
+ }
self.refresh( event.state.revid1,
event.state.revid2 );
} );
}
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index aa86db4..1b2e39e 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -27,6 +27,11 @@
initialize: function () {
this.$html = $( '<div class="pointer" />' ).addClass(
this.cssClass );
+ if ( this.cssClass === 'left-pointer' ) {
+ this.$html.addClass( 'oldid-pointer' );
+ } else {
+ this.$html.addClass( 'newid-pointer' );
+ }
},
/**
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 6260df9..02acb05 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -86,6 +86,17 @@
diffPage.refresh( revId1, revId2 );
diffPage.pushState( revId1, revId2,
self );
+ },
+ drag: function () {
+ var leftPointerOffset =
self.leftPointer.getView().getElement().offset(),
+ rightPointerOffset =
self.rightPointer.getView().getElement().offset();
+ if ( leftPointerOffset.left >
rightPointerOffset.left ) {
+
self.leftPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
+
self.rightPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
+ } else {
+
self.leftPointer.getView().getElement().removeClass( 'newid-pointer'
).addClass( 'oldid-pointer' );
+
self.rightPointer.getView().getElement().removeClass( 'oldid-pointer'
).addClass( 'newid-pointer' );
+ }
}
} );
diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index b908cdb..eeb0e3b 100755
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -69,11 +69,11 @@
margin: auto;
z-index: 10;
}
-.left-pointer {
- border-color: transparent transparent #00f transparent;
+.oldid-pointer {
+ border-color: transparent transparent #ffe49c transparent;
}
-.right-pointer {
- border-color: transparent transparent #f00 transparent;
+.newid-pointer {
+ border-color: transparent transparent #a3d3ff transparent;
}
.pointer {
position: absolute !important;
--
To view, visit https://gerrit.wikimedia.org/r/288584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68a2159bde6fff969ca54a79587cfe03ed783454
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Gabriel Birke <gabriel.bi...@wikimedia.de>
Gerrit-Reviewer: Jakob <jakob.warkot...@wikimedia.de>
Gerrit-Reviewer: Kai Nissen (WMDE) <kai.nis...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.fisc...@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
