Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123158
Change subject: Hide metadata top button texts
......................................................................
Hide metadata top button texts
Also make sure that the reuse dialog is positioned right, no
matter where its button is.
Change-Id: I86feed07738ebef012e63861ed909f3449b85a53
---
M resources/mmv/ui/mmv.ui.reuse.dialog.js
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.stripeButtons.js
3 files changed, 20 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/58/123158/1
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.js
b/resources/mmv/ui/mmv.ui.reuse.dialog.js
index adee7a4..6a6c9c8 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.js
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.js
@@ -174,6 +174,7 @@
DP.openDialog = function () {
this.startListeningToOutsideClick();
this.$reuseDialog.show();
+ this.fixDownArrowPosition();
$( document ).trigger( 'mmv-reuse-opened' );
this.isOpen = true;
this.tabs[this.selectedTab].show();
@@ -215,5 +216,22 @@
$( document ).off( 'click.mmv', this.outsideClickHandler );
};
+ /**
+ * Fixes the tip of the container to point to the icon which opens it.
+ */
+ DP.fixDownArrowPosition = function() {
+ var $openButton = $( '.mw-mmv-stripe-button-reuse' ),
+ buttonPosition = $openButton.offset().left,
+ arrowPositionBase =
this.$downArrow.offsetParent().offset().left,
+ buttonWidth = $openButton.outerWidth(),
+ arrowWidth = this.$downArrow.outerWidth(),
+
+ // this is the correct position of the arrow relative
to the viewport - we want
+ // the middle of the arrow to be positioned over the
middle of the button
+ offset = buttonPosition + ( buttonWidth - arrowWidth )
/ 2;
+
+ this.$downArrow.css( 'left', ( offset - arrowPositionBase ) +
'px' );
+ };
+
mw.mmv.ui.reuse.Dialog = Dialog;
}( mediaWiki, jQuery, OO ) );
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.less
b/resources/mmv/ui/mmv.ui.reuse.dialog.less
index 6086e02..079476b 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.less
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.less
@@ -76,7 +76,7 @@
border-bottom: @arrow-border-size solid @arrow-border-color;
.rotate(45deg);
position: absolute;
- right: 60px;
+ // vertical positioning will be done in JS
bottom: -1 * ( @arrow-size / 2 ) - @arrow-border-size;
}
}
diff --git a/resources/mmv/ui/mmv.ui.stripeButtons.js
b/resources/mmv/ui/mmv.ui.stripeButtons.js
index bacfc53..3708e06 100644
--- a/resources/mmv/ui/mmv.ui.stripeButtons.js
+++ b/resources/mmv/ui/mmv.ui.stripeButtons.js
@@ -58,7 +58,6 @@
SBP.createButton = function ( cssClass, text, popupText ) {
return $( '<a>' )
.addClass( 'mw-mmv-stripe-button empty ' + cssClass )
- .text( text )
.prop( 'title', popupText )
.appendTo( this.$buttonContainer )
.tipsy( { gravity: 's' } );
@@ -71,6 +70,7 @@
SBP.initReuseButton = function() {
this.buttons.$reuse = this.createButton(
'mw-mmv-stripe-button-reuse',
+ mw.message( 'multimediaviewer-reuse-link' ).text(),
mw.message( 'multimediaviewer-reuse-link' ).text()
);
};
--
To view, visit https://gerrit.wikimedia.org/r/123158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86feed07738ebef012e63861ed909f3449b85a53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
