diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json index e76de97873..ed166773b0 100644 --- a/.eslintrc.es6.json +++ b/.eslintrc.es6.json @@ -48,7 +48,6 @@ "camelcase": 0, "eqeqeq": 0, "space-unary-ops": 0, - "no-shadow": 0, "no-alert": 0, "no-script-url": 0, "wrap-iife": 0, diff --git a/assets/js/src/listing/bulk_actions.jsx b/assets/js/src/listing/bulk_actions.jsx index d63843a647..70ba92e429 100644 --- a/assets/js/src/listing/bulk_actions.jsx +++ b/assets/js/src/listing/bulk_actions.jsx @@ -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) { diff --git a/assets/js/src/newsletters/listings/welcome.jsx b/assets/js/src/newsletters/listings/welcome.jsx index 9d9a6629bb..24f87c339a 100644 --- a/assets/js/src/newsletters/listings/welcome.jsx +++ b/assets/js/src/newsletters/listings/welcome.jsx @@ -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) { diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 958d6e74c4..ed0fd2bf1d 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -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') ); diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx index da50f7c986..db40169597 100644 --- a/assets/js/src/newsletters/templates.jsx +++ b/assets/js/src/newsletters/templates.jsx @@ -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, });