Fix ES6 no-shadow eslint rule [MAILPOET-1137]

This commit is contained in:
stoletniy
2017-10-26 14:20:58 +03:00
committed by Vlad
parent e4f16eda49
commit dc7c629e3b
5 changed files with 11 additions and 12 deletions

View File

@@ -67,8 +67,8 @@ define([
getSelectedAction: function () {
const selected_action = this.refs.action.value;
if (selected_action.length > 0) {
const action = this.props.bulk_actions.filter((action) => {
return (action.name === selected_action);
const action = this.props.bulk_actions.filter((act) => {
return (act.name === selected_action);
});
if (action.length > 0) {

View File

@@ -197,8 +197,8 @@ const NewsletterListWelcome = React.createClass({
case 'segment':
// get segment
segment = _.find(mailpoet_segments, (segment) => {
return (~~(segment.id) === ~~(newsletter.options.segment));
segment = _.find(mailpoet_segments, (seg) => {
return (~~(seg.id) === ~~(newsletter.options.segment));
});
if (segment === undefined) {

View File

@@ -109,12 +109,12 @@ define(
id: this.props.params.id,
status: 'active',
},
}).done((response) => {
}).done((response2) => {
// redirect to listing based on newsletter type
this.context.router.push(`/${this.state.item.type || ''}`);
const opts = this.state.item.options;
// display success message depending on newsletter type
if (response.data.type === 'welcome') {
if (response2.data.type === 'welcome') {
MailPoet.Notice.success(
MailPoet.I18n.t('welcomeEmailActivated')
);
@@ -123,7 +123,7 @@ define(
'List type': opts.event,
Delay: opts.afterTimeNumber + ' ' + opts.afterTimeType,
});
} else if (response.data.type === 'notification') {
} else if (response2.data.type === 'notification') {
MailPoet.Notice.success(
MailPoet.I18n.t('postNotificationActivated')
);
@@ -141,11 +141,11 @@ define(
data: {
newsletter_id: this.props.params.id,
},
}).done((response) => {
}).done((response2) => {
// redirect to listing based on newsletter type
this.context.router.push(`/${this.state.item.type || ''}`);
if (response.data.status === 'scheduled') {
if (response2.data.status === 'scheduled') {
MailPoet.Notice.success(
MailPoet.I18n.t('newsletterHasBeenScheduled')
);

View File

@@ -57,9 +57,9 @@ define(
const reader = new FileReader();
const saveTemplate = this.saveTemplate;
reader.onload = (e) => {
reader.onload = (evt) => {
try {
saveTemplate(JSON.parse(e.target.result));
saveTemplate(JSON.parse(evt.target.result));
MailPoet.trackEvent('Emails > Template imported', {
'MailPoet Free version': window.mailpoet_version,
});