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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.es6.json
View File

@@ -48,7 +48,6 @@
"camelcase": 0, "camelcase": 0,
"eqeqeq": 0, "eqeqeq": 0,
"space-unary-ops": 0, "space-unary-ops": 0,
"no-shadow": 0,
"no-alert": 0, "no-alert": 0,
"no-script-url": 0, "no-script-url": 0,
"wrap-iife": 0, "wrap-iife": 0,

4
assets/js/src/listing/bulk_actions.jsx
View File

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

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

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

10
assets/js/src/newsletters/send.jsx
View File

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

4
assets/js/src/newsletters/templates.jsx
View File

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