jenkins-bot has submitted this change and it was merged.
Change subject: Swap X button for arrow for editor overlay
......................................................................
Swap X button for arrow for editor overlay
In process switch to using partials rather than Icon::toHtmlString
Bug: T95776
Change-Id: I2816e0f73f18d461277a6f52c767378930ff748a
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collection.editor/header.hogan
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 3323d2a..6e1b887 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -32,7 +32,14 @@
name: 'clear',
label: mw.msg(
'gather-edit-collection-clear-label' ),
additionalClassNames: 'clear hidden'
- } ).toHtmlString(),
+ } ).options,
+ // FIXME: Should live in MobileFrontend
+ cancelArrowIcon: new Icon( {
+ tagName: 'button',
+ name: 'back',
+ additionalClassNames: 'cancel',
+ label: mw.msg( 'mobile-frontend-overlay-close' )
+ } ).options,
editFailedError: mw.msg(
'gather-edit-collection-failed-error' ),
unknownCollectionError: mw.msg(
'gather-error-unknown-collection' ),
collection: null,
@@ -59,6 +66,7 @@
} ),
/** @inheritdoc */
templatePartials: $.extend( {},
Overlay.prototype.templatePartials, {
+ icon: Icon.prototype.template,
header: mw.template.get(
'ext.gather.collection.editor', 'header.hogan' ),
content: mw.template.get(
'ext.gather.collection.editor', 'content.hogan' )
} ),
diff --git a/resources/ext.gather.collection.editor/header.hogan
b/resources/ext.gather.collection.editor/header.hogan
index 217ecb2..c74ea4e 100644
--- a/resources/ext.gather.collection.editor/header.hogan
+++ b/resources/ext.gather.collection.editor/header.hogan
@@ -1,6 +1,6 @@
<div class="overlay-header save-header hideable">
<ul>
- <li>{{{cancelButton}}}</li>
+ <li>{{#cancelArrowIcon}}{{>icon}}{{/cancelArrowIcon}}</li>
</ul>
<div class="overlay-title">
<h2><span
class="truncated-text">{{collection.title}}</span></h2>
@@ -25,7 +25,7 @@
<div class="overlay-title">
<div class="search">
<input class="search" type="text">
- {{{clearIcon}}}
+ {{#clearIcon}}{{>icon}}{{/clearIcon}}
</div>
</div>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/204635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2816e0f73f18d461277a6f52c767378930ff748a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
