jenkins-bot has submitted this change and it was merged.
Change subject: Use a span for subscriber count field, not a text input box
......................................................................
Use a span for subscriber count field, not a text input box
Users shouldn't be editing this box so it doesn't make sense to have
a text input here. This is prettier too.
Bug: T108161
Change-Id: Icc6907140601efd92fab83dd5a1299328e8f037f
---
M includes/specials/pagers/NewsletterTablePager.php
M modules/ext.newsletter.js
2 files changed, 9 insertions(+), 14 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index f359b71..81d6a26 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -74,16 +74,10 @@
case 'nl_frequency':
return htmlspecialchars( $value );
case 'subscriber_count':
- // @todo Make this prettier
return HTML::element(
- 'input',
- array(
- 'type' => 'textbox',
- 'readonly' => 'true',
- 'id' => 'newsletter-' . $id,
- 'value' =>
$this->mCurrentRow->subscribers,
-
- )
+ 'span',
+ array( 'id' => "nl-count-$id" ),
+ $this->mCurrentRow->subscribers
);
case 'action' :
if (
$this->mCurrentRow->current_user_subscribed ) {
@@ -92,7 +86,7 @@
$this->msg(
'newsletter-unsubscribe-button' )->escaped(),
array(
'class' =>
'newsletter-subscription newsletter-subscribed',
- 'id' => 'nl-' . $id
+ 'id' => "nl-$id"
)
);
} else {
@@ -102,7 +96,7 @@
$this->msg(
'newsletter-subscribe-button' )->escaped(),
array(
'class' =>
'newsletter-subscription newsletter-unsubscribed',
- 'id' => 'nl-' . $id
+ 'id' => "nl-$id"
)
);
}
diff --git a/modules/ext.newsletter.js b/modules/ext.newsletter.js
index eaa48c9..d8b5198 100644
--- a/modules/ext.newsletter.js
+++ b/modules/ext.newsletter.js
@@ -29,7 +29,8 @@
var promise,
$link = $( this ),
newsletterId = ( $link.prop( 'id' ) )
- .substr( ( $link.prop( 'id' )
).indexOf( '-' ) + 1 );
+ .substr( ( $link.prop( 'id' )
).indexOf( '-' ) + 1 ),
+ $subscriberCount = $( 'span#nl-count-' +
newsletterId );
// Avoid double clicks while in progress
.newsletter-link-disabled also helps with this
if ( $link.data( 'nlDisabled' ) ) {
@@ -46,7 +47,7 @@
promise = doAPIRequest( 'unsubscribe',
newsletterId )
.done( function ( data ) {
updateLinkAttribs( $link,
'subscribe' );
- $( 'input#newsletter-' +
newsletterId ).get( 0 ).value--;
+ $subscriberCount.text(
parseInt( $subscriberCount.text() ) - 1 );
mw.notify( mw.msg(
'newsletter-unsubscribe-success', data.newslettersubscribe.name ) );
} );
} else {
@@ -56,7 +57,7 @@
promise = doAPIRequest( 'subscribe',
newsletterId )
.done( function ( data ) {
updateLinkAttribs( $link,
'unsubscribe' );
- $( 'input#newsletter-' +
newsletterId ).get( 0 ).value++;
+ $subscriberCount.text(
parseInt( $subscriberCount.text() ) + 1 );
mw.notify( mw.msg(
'newsletter-subscribe-success', data.newslettersubscribe.name ) );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/249725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc6907140601efd92fab83dd5a1299328e8f037f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tinaj1234 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
