Jakob has submitted this change and it was merged.
Change subject: Remove "legend" annotations and move scrolling button hint to a
tooltip
......................................................................
Remove "legend" annotations and move scrolling button hint to a tooltip
This also removes a "diff size" axis legend.
Bug: T136098
Change-Id: I9705d6ab37c8d24b9bdb1fddaa895b2863e98043
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.css
5 files changed, 18 insertions(+), 54 deletions(-)
Approvals:
Jakob: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 8195c55..24f96ca 100755
--- a/extension.json
+++ b/extension.json
@@ -82,9 +82,8 @@
"ext.RevisionSlider.Pointer"
],
"messages": [
- "revisionslider-annotations-newer",
- "revisionslider-annotations-older",
- "revisionslider-annotations-diffsize"
+ "revisionslider-arrow-tooltip-newer",
+ "revisionslider-arrow-tooltip-older"
]
},
"ext.RevisionSlider.DiffPage": {
diff --git a/i18n/en.json b/i18n/en.json
index 626005f..b9eca7a 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,7 +13,6 @@
"revisionslider-loading-failed": "The revision slider failed to load.",
"revisionslider-loading-out-of-range": "The revision slider failed to load
as the requested revisions are not in the top 500 versions of the page.",
"revisionslider-loading-noscript": "As you have JavaScript disabled the
revision slider will not be able to load.",
- "revisionslider-annotations-newer": "newer",
- "revisionslider-annotations-older": "older",
- "revisionslider-annotations-diffsize": "diff size"
+ "revisionslider-arrow-tooltip-newer": "See newer revisions",
+ "revisionslider-arrow-tooltip-older": "See older revisions"
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9c531c8..3a12104 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -13,7 +13,6 @@
"revisionslider-loading-failed": "Message shown if the RevisionSlider
fails to initially load.",
"revisionslider-loading-out-of-range": "Message shown if the
RevisionSlider fails to initially load due to revisions being requested that
are not in the most recent 500 revisions.",
"revisionslider-loading-noscript": "Message shown while the
RevisionSlider is trying to load but when JavaScript is disabled and thus it
will not be successful.",
- "revisionslider-annotations-newer": "Label shown to indicate the
direction to newer revisions.",
- "revisionslider-annotations-older": "Label shown to indicate direction
to older revisions.",
- "revisionslider-annotations-diffsize": "Label shown vertically to
indicate meaning of revision bar heights."
+ "revisionslider-arrow-tooltip-newer": "Text shown after hovering the
button scrolling to newer revisions.",
+ "revisionslider-arrow-tooltip-older": "Text shown after hovering the
button scrolling to older revisions."
}
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 61d7181..c98a588 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -46,14 +46,23 @@
$slider.css( {
width: ( containerWidth +
this.containerMargin ) + 'px'
} )
- .append( $( '<a class="arrow left-arrow
oo-ui-icon-caretLast" data-dir="-1"></a>' ) )
- .append( $( '<div class="revisions-diffsize">'
+ mw.message( 'revisionslider-annotations-diffsize' ).text() + '</div>' ) )
+ .append(
+ $( '<a class="arrow left-arrow
oo-ui-icon-caretLast" data-dir="-1" title="' + mw.message(
'revisionslider-arrow-tooltip-older' ).text() + '"></a>' )
+ .tipsy()
+ )
.append( $( '<div class="revisions-container"
/>' )
.css( {
width: containerWidth + 'px'
} )
.append( $revisions ) )
- .append( $( '<a class="arrow right-arrow
oo-ui-icon-caretNext" data-dir="1"></a>' ) )
+ .append(
+ $( '<a class="arrow right-arrow
oo-ui-icon-caretNext" data-dir="1" title="' + mw.message(
'revisionslider-arrow-tooltip-newer' ).text() + '"></a>' )
+ .tipsy( {
+ gravity: function () {
+ return Math.abs(
window.innerWidth - this.getBoundingClientRect().right ) > 90 ? 'n' : 'ne';
+ }
+ } )
+ )
.append( $( '<div style="clear: both" />' ) )
.append(
$( '<div class="pointer-container" />' )
@@ -132,7 +141,6 @@
this.$element = $slider;
$container.html( $slider );
- $slider.after( this.makeAnnotations() );
this.slide( Math.floor( this.pointerTwo.getPosition() /
this.slider.getRevisionsPerWindow() ), 0 );
this.diffPage.pushState(
mw.config.values.extRevisionSliderOldRev,
mw.config.values.extRevisionSliderNewRev, this );
@@ -164,12 +172,6 @@
getNewRevElement: function ( $revs ) {
return $revs.find( 'div.revision[data-revid=\'' +
mw.config.values.extRevisionSliderNewRev + '\']' );
- },
-
- makeAnnotations: function () {
- return $( '<div class="revisions-annotations"/>' )
- .append( '<span class="revisions-older">← ' +
mw.message( 'revisionslider-annotations-older' ).text() + '</span>' )
- .append( '<span class="revisions-newer">' +
mw.message( 'revisionslider-annotations-newer' ).text() + ' →</span>' );
},
initializePointers: function ( $oldRevElement, $newRevElement )
{
diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index fc42675..79bbf2a 100755
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -132,46 +132,11 @@
background-repeat: no-repeat;
}
-
-.revisions-annotations {
- color: #bcbcbc;
- font-size: 88%;
- margin: 0 60px;
-}
.revisions-older {
float:left;
}
.revisions-newer {
float:right;
-}
-.revisions-diffsize {
- color: #bcbcbc;
- font-size: 88%;
-
- width: 140px;
- height: 20px;
- border-bottom: solid 1px #bcbcbc;
-
- position: absolute;
- top: 60px;
- left: -30px;
-
- /* see http://stackoverflow.com/a/1080812/4782503 */
- -webkit-transform: rotate(-90deg);
- -moz-transform: rotate(-90deg);
- -ms-transform: rotate(-90deg);
- -o-transform: rotate(-90deg);
- transform: rotate(-90deg);
-
- /* also accepts left, right, top, bottom coordinates; not required, but a
good idea for styling */
- -webkit-transform-origin: 50% 50%;
- -moz-transform-origin: 50% 50%;
- -ms-transform-origin: 50% 50%;
- -o-transform-origin: 50% 50%;
- transform-origin: 50% 50%;
-
- /* Should be unset in IE9+ I think. */
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
}
#revision-slider-darkness {
--
To view, visit https://gerrit.wikimedia.org/r/290903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9705d6ab37c8d24b9bdb1fddaa895b2863e98043
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de>
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: Siebrand <siebr...@kitano.nl>
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
