[MediaWiki-commits] [Gerrit] Fix the reference close button - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/130786

Change subject: Fix the reference close button
......................................................................

Fix the reference close button

Perform hygiene on close button -> cancel button to be consistent with
overlays in process
Bug: 64629

Change-Id: If0bd21f00c4a82582da8d74fb117eb91eae5ffcc
---
M javascripts/common/Drawer.js
M less/common/drawer.less
M templates/ReferencesDrawer.html
M templates/ctaDrawer.html
M templates/keepgoing/KeepGoingDrawer.html
5 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/86/130786/1

diff --git a/javascripts/common/Drawer.js b/javascripts/common/Drawer.js
index f5728a6..8fb581a 100644
--- a/javascripts/common/Drawer.js
+++ b/javascripts/common/Drawer.js
@@ -17,8 +17,7 @@
 
                postRender: function() {
                        var self = this;
-                       // FIXME: Standardise on either close or cancel to be 
consistent with Overlay.js
-                       this.$( '.close' ).click( function( ev ) {
+                       this.$( '.cancel' ).click( function( ev ) {
                                ev.preventDefault();
                                self.hide();
                        } );
diff --git a/less/common/drawer.less b/less/common/drawer.less
index ee616b6..c396682 100644
--- a/less/common/drawer.less
+++ b/less/common/drawer.less
@@ -16,7 +16,7 @@
 //
 // Markup:
 // <div class="drawer visible">
-//  <a class='close'>close</a>
+//  <a class='cancel'>close</a>
 //  <p>hello</p>
 // </div>
 //
@@ -37,7 +37,7 @@
                margin-top: .5em;
        }
 
-       a.close {
+       a.cancel {
                padding: 0 0 1.2em;
                display: block;
                overflow: hidden;
diff --git a/templates/ReferencesDrawer.html b/templates/ReferencesDrawer.html
index d3189d5..9783797 100644
--- a/templates/ReferencesDrawer.html
+++ b/templates/ReferencesDrawer.html
@@ -1,4 +1,4 @@
-<button></button>
+<button class="cancel"></button>
 <h3>{{title}}</h3>
 {{{text}}}
 
diff --git a/templates/ctaDrawer.html b/templates/ctaDrawer.html
index 3164d7a..e43752a 100644
--- a/templates/ctaDrawer.html
+++ b/templates/ctaDrawer.html
@@ -1,4 +1,4 @@
-<a class="close" href="#">{{cancelMessage}}</a>
+<a class="cancel" href="#">{{cancelMessage}}</a>
 <p>{{content}}</p>
 <div class="buttonBar mw-ui-button-group">
        <a class="button wide mw-ui-button mw-ui-block mw-ui-progressive" 
href="{{loginUrl}}">{{loginCaption}}</a>
diff --git a/templates/keepgoing/KeepGoingDrawer.html 
b/templates/keepgoing/KeepGoingDrawer.html
index 4bfd35b..5829727 100644
--- a/templates/keepgoing/KeepGoingDrawer.html
+++ b/templates/keepgoing/KeepGoingDrawer.html
@@ -1,5 +1,5 @@
 <p>{{msg}}</p>
 <div class="buttonBar">
-       <button class="inline close mw-ui-button mw-ui-progressive 
mw-ui-quiet">{{cancel}}</button>
+       <button class="inline cancel mw-ui-button mw-ui-progressive 
mw-ui-quiet">{{cancel}}</button>
        <a class="continue button mw-ui-button mw-ui-progressive" 
href="{{nextUrl}}">{{{nextLabel}}}</a>
 </div>

-- 
To view, visit https://gerrit.wikimedia.org/r/130786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0bd21f00c4a82582da8d74fb117eb91eae5ffcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits