Merge branch 'es5_es6_lint' of github-mp:mailpoet/mailpoet into es5_es6_lint

This commit is contained in:
Amine Ben hammou
2018-04-18 18:00:53 +02:00
2 changed files with 7 additions and 4 deletions

View File

@@ -6,6 +6,7 @@ import MailPoet from 'mailpoet';
import classNames from 'classnames';
import moment from 'moment';
import jQuery from 'jquery';
import _ from 'underscore';
import Hooks from 'wp-js-hooks';
import StatsBadge from 'newsletters/badges/stats.jsx';
@@ -90,6 +91,7 @@ const QueueMixin = {
</span>
);
} else {
const resumeSendingClick = _.partial(this.resumeSending, newsletter);
label = (
<span>
{ newsletter.queue.count_processed } / { newsletter.queue.count_total }
@@ -100,7 +102,7 @@ const QueueMixin = {
style={{ display: (newsletter.queue.status === 'paused')
? 'inline-block' : 'none' }}
href="javascript:;"
onClick={this.resumeSending.bind(null, newsletter)}
onClick={resumeSendingClick}
>{MailPoet.I18n.t('resume')}</a>
<a
id={`pause_${newsletter.id}`}
@@ -108,7 +110,7 @@ const QueueMixin = {
style={{ display: (newsletter.queue.status === null)
? 'inline-block' : 'none' }}
href="javascript:;"
onClick={this.pauseSending.bind(null, newsletter)}
onClick={resumeSendingClick}
>{MailPoet.I18n.t('pause')}</a>
</span>
);
@@ -410,7 +412,8 @@ const MailerMixin = {
<p>{ mailerErrorNotice }</p>
<p>{ mailerCheckSettingsNotice }</p>
<p>
<a href="javascript:;"
<a
href="javascript:;"
className="button"
onClick={this.resumeMailerSending}
>{ MailPoet.I18n.t('mailerResumeSendingButton') }</a>

View File

@@ -118,7 +118,7 @@ const NewsletterListNotificationHistory = React.createClass({
onRenderItem={this.renderItem}
columns={columns}
item_actions={newsletterActions}
auto_refresh={true}
auto_refresh
sort_by="sent_at"
sort_order="desc"
afterGetItems={this.checkMailerStatus}