jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Add button partial support to overlays
......................................................................
Hygiene: Add button partial support to overlays
As an example turn the details button in media viewer into a
Button view.
Change-Id: I1e843f50422f508f63765c7865bce255eb6395de
---
M javascripts/Overlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M javascripts/modules/mediaViewer/ImageOverlayNew.js
M templates/modules/mediaViewer/ImageOverlay.hogan
4 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index b1de0b4..09ac9a1 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -4,6 +4,7 @@
var
View = M.require( 'View' ),
Icon = M.require( 'Icon' ),
+ Button = M.require( 'Button' ),
icons = M.require( 'icons' ),
browser = M.require( 'browser' ),
$window = $( window ),
@@ -40,7 +41,8 @@
*/
className: 'overlay',
templatePartials: {
- header: mw.template.get( 'mobile.overlays',
'header.hogan' )
+ header: mw.template.get( 'mobile.overlays',
'header.hogan' ),
+ button: Button.prototype.template
},
template: mw.template.get( 'mobile.overlays', 'Overlay.hogan' ),
/**
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 36427a8..740e6b9 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -1,6 +1,7 @@
( function ( M, $ ) {
var Overlay = M.require( 'Overlay' ),
Icon = M.require( 'Icon' ),
+ Button = M.require( 'Button' ),
ImageApi = M.require( 'modules/mediaViewer/ImageApi' ),
ImageOverlay, api;
@@ -23,8 +24,7 @@
* @inheritdoc
* @cfg {Object} defaults Default options hash.
* @cfg {String} defaults.cancelButton HTML of the cancel
button.
- * @cfg {String} defaults.detailsMsg Caption for a button
leading to the details
- * of a media file (e.g. an image) in a preview.
+ * @cfg {Object} defaults.detailsButton options for details
button
* @cfg {String} defaults.licenseLinkMsg Link to license
information in media viewer.
* @cfg {Thumbnail[]} defaults.thumbnails a list of thumbnails
to browse
*/
@@ -36,7 +36,11 @@
additionalClassNames: 'cancel',
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).toHtmlString(),
- detailsMsg: mw.msg( 'mobile-frontend-media-details' ),
+ detailsButton: new Button( {
+ label: mw.msg( 'mobile-frontend-media-details'
),
+ additionalClassNames: 'button',
+ progressive: true
+ } ).options,
licenseLinkMsg: mw.msg(
'mobile-frontend-media-license-link' ),
thumbnails: []
} ),
diff --git a/javascripts/modules/mediaViewer/ImageOverlayNew.js
b/javascripts/modules/mediaViewer/ImageOverlayNew.js
index faeb7f0..039959d 100644
--- a/javascripts/modules/mediaViewer/ImageOverlayNew.js
+++ b/javascripts/modules/mediaViewer/ImageOverlayNew.js
@@ -11,9 +11,9 @@
*/
ImageOverlayNew = ImageOverlay.extend( {
template: mw.template.get( 'mobile.mediaViewer.beta',
'Overlay.hogan' ),
- templatePartials: {
+ templatePartials: $.extend( {},
ImageOverlay.prototype.templatePartials, {
content: mw.template.get( 'mobile.mediaViewer',
'Overlay.hogan' )
- },
+ } ),
events: $.extend( {}, ImageOverlay.prototype.events, {
// Click tracking for table of contents so we can see
if people interact with it
'click .slider-button': 'onSlide'
diff --git a/templates/modules/mediaViewer/ImageOverlay.hogan
b/templates/modules/mediaViewer/ImageOverlay.hogan
index 5358f63..59ccb54 100644
--- a/templates/modules/mediaViewer/ImageOverlay.hogan
+++ b/templates/modules/mediaViewer/ImageOverlay.hogan
@@ -6,7 +6,9 @@
</div>
{{{cancelButton}}}
<div class="details">
- <a class="mw-ui-button mw-ui-progressive button"
href="#">{{detailsMsg}}</a>
+ {{#detailsButton}}
+ {{>button}}
+ {{/detailsButton}}
<p class="truncated-text">{{caption}}</p>
<p class="license"><a href="#">{{licenseLinkMsg}}</a></p>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/204409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e843f50422f508f63765c7865bce255eb6395de
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
