jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363732 )
Change subject: Show correct icon in EditorOverlay
......................................................................
Show correct icon in EditorOverlay
Replace the `back` icon on the first screen of EditorOverlay with a
'close' icon as this behavior is consistent with how other overlays
such as the language overlay and the categories overlay work.
Bug: T73203
Change-Id: I09d0d63b488314160a7bdbd8f4974744f0a60c34
---
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.editor.common/editHeader.hogan
M tests/browser/features/support/pages/article_page.rb
3 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/mobile.editor.common/EditorOverlayBase.js
b/resources/mobile.editor.common/EditorOverlayBase.js
index f032cbe..ebb2f9f 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -138,7 +138,6 @@
/** @inheritdoc **/
className: 'overlay editor-overlay',
events: $.extend( {}, Overlay.prototype.events, {
- // FIXME: This should be .close (see bug 71203)
'click .back': 'onClickBack',
'click .continue': 'onClickContinue',
'click .submit': 'onClickSubmit'
diff --git a/resources/mobile.editor.common/editHeader.hogan
b/resources/mobile.editor.common/editHeader.hogan
index 1b8bcd0..64035ac 100644
--- a/resources/mobile.editor.common/editHeader.hogan
+++ b/resources/mobile.editor.common/editHeader.hogan
@@ -1,6 +1,6 @@
<div class="overlay-header header initial-header hideable hidden">
<ul>
- <li>{{{backButton}}}</li>
+ <li>{{{cancelButton}}}</li>
</ul>
{{^hasToolbar}}
<div class="overlay-title">
diff --git a/tests/browser/features/support/pages/article_page.rb
b/tests/browser/features/support/pages/article_page.rb
index 68f58f0..ef955ca 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -37,7 +37,7 @@
div(:anon_editor_warning, css: '.anon-msg')
div(:editor_overlay, class: 'editor-overlay')
button(:editor_overlay_close_button) do |page|
- page.editor_overlay_element.button_element(css: '.back')
+ page.editor_overlay_element.button_element(css: '.cancel')
end
## upload
--
To view, visit https://gerrit.wikimedia.org/r/363732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09d0d63b488314160a7bdbd8f4974744f0a60c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: 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
