Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

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

Browse Source
This commit is contained in:
Amine Ben hammou
2018-04-18 17:50:50 +02:00
parent 57de46cb29 6322932e25
commit c41fd4cb3b
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletters/listings/notification.jsx
View File

@@ -328,7 +328,7 @@ const NewsletterListNotification = React.createClass({
bulk_actions={bulkActions} bulk_actions={bulkActions}
item_actions={newsletterActions} item_actions={newsletterActions}
messages={messages} messages={messages}
auto_refresh={true} auto_refresh
sort_by="updated_at" sort_by="updated_at"
sort_order="desc" sort_order="desc"
afterGetItems={this.checkMailerStatus} afterGetItems={this.checkMailerStatus}

6
assets/js/src/newsletters/listings/standard.jsx
View File

@@ -216,7 +216,9 @@ const NewsletterListStandard = React.createClass({
<div> <div>
<h1 className="title"> <h1 className="title">
{MailPoet.I18n.t('pageTitle')} {MailPoet.I18n.t('pageTitle')}
<Link className="page-title-action" to="/new" <Link
className="page-title-action"
to="/new"
onClick={() => MailPoet.trackEvent('Emails > Add New', onClick={() => MailPoet.trackEvent('Emails > Add New',
{ 'MailPoet Free version': window.mailpoet_version } { 'MailPoet Free version': window.mailpoet_version }
)} )}
@@ -240,7 +242,7 @@ const NewsletterListStandard = React.createClass({
bulk_actions={bulkActions} bulk_actions={bulkActions}
item_actions={newsletterActions} item_actions={newsletterActions}
messages={messages} messages={messages}
auto_refresh={true} auto_refresh
sort_by="sent_at" sort_by="sent_at"
sort_order="desc" sort_order="desc"
afterGetItems={this.checkMailerStatus} afterGetItems={this.checkMailerStatus}

4
assets/js/src/newsletters/listings/tabs.jsx
View File

@@ -28,7 +28,7 @@ const ListingTabs = React.createClass({
}; };
}, },
render() { render() {
const tabs = this.state.tabs.map((tab, index) => { const tabs = this.state.tabs.map(tab => {
const tabClasses = classNames( const tabClasses = classNames(
'nav-tab', 'nav-tab',
{ 'nav-tab-active': (this.props.tab === tab.name) } { 'nav-tab-active': (this.props.tab === tab.name) }
@@ -36,7 +36,7 @@ const ListingTabs = React.createClass({
return ( return (
<Link <Link
key={`tab-${index}`} key={`tab-${tab.label}`}
className={tabClasses} className={tabClasses}
to={tab.link} to={tab.link}
onClick={() => MailPoet.trackEvent(`Tab Emails > ${tab.name} clicked`, onClick={() => MailPoet.trackEvent(`Tab Emails > ${tab.name} clicked`,

2
assets/js/src/newsletters/listings/welcome.jsx
View File

@@ -311,7 +311,7 @@ const NewsletterListWelcome = React.createClass({
bulk_actions={bulkActions} bulk_actions={bulkActions}
item_actions={newsletterActions} item_actions={newsletterActions}
messages={messages} messages={messages}
auto_refresh={true} auto_refresh
sort_by="updated_at" sort_by="updated_at"
sort_order="desc" sort_order="desc"
afterGetItems={this.checkMailerStatus} afterGetItems={this.checkMailerStatus}