diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json index 647a4782ba..168518b72e 100644 --- a/.eslintrc.es6.json +++ b/.eslintrc.es6.json @@ -48,7 +48,6 @@ "keyword-spacing": 0, "default-case": 0, "quote-props": 0, - "indent": 0, "arrow-parens": 0, "array-callback-return": 0, "consistent-return": 0, diff --git a/assets/js/src/form/fields/date.jsx b/assets/js/src/form/fields/date.jsx index 2bafb563a1..3ac9a944eb 100644 --- a/assets/js/src/form/fields/date.jsx +++ b/assets/js/src/form/fields/date.jsx @@ -147,26 +147,26 @@ define([ 'month': this.state.month, 'day': this.state.day }; - break; + break; case 'year_month': value = { 'year': this.state.year, 'month': this.state.month }; - break; + break; case 'month': value = { 'month': this.state.month }; - break; + break; case 'year': value = { 'year': this.state.year }; - break; + break; } return value; @@ -212,7 +212,7 @@ define([ year={ this.state.year } placeholder={ this.props.field.year_placeholder } />); - break; + break; case 'MM': return (); - break; + break; case 'DD': return (); - break; + break; } - }); + }); return (
diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx index e2db24c7d8..7cbf3710dc 100644 --- a/assets/js/src/form/fields/field.jsx +++ b/assets/js/src/form/fields/field.jsx @@ -36,35 +36,35 @@ define([ switch(data.field.type) { case 'text': field = (); - break; + break; case 'textarea': field = (); - break; + break; case 'select': field = (); - break; + break; case 'radio': field = (); - break; + break; case 'checkbox': field = (); - break; + break; case 'selection': field = (); - break; + break; case 'date': field = (); - break; + break; case 'reactComponent': field = (); - break; + break; } if(inline === true) { diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index 3a16d97091..9732e53c72 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -124,7 +124,7 @@ define([ } const transformedValue = this.transformChangedValue(value); this.props.onValueChange({ - target: { + target: { value: transformedValue, name: this.props.field.name } diff --git a/assets/js/src/listing/filters.jsx b/assets/js/src/listing/filters.jsx index 6504ef54d0..00bc57fd1d 100644 --- a/assets/js/src/listing/filters.jsx +++ b/assets/js/src/listing/filters.jsx @@ -39,8 +39,8 @@ define([ jQuery(this.refs['filter-'+i]) .val(selected_filters[filter]) .trigger('change'); - } } + } ); }, render: function () { @@ -63,7 +63,7 @@ define([ }) } ); - }); + }); let button; diff --git a/assets/js/src/listing/groups.jsx b/assets/js/src/listing/groups.jsx index 826b01c02d..c38049aad4 100644 --- a/assets/js/src/listing/groups.jsx +++ b/assets/js/src/listing/groups.jsx @@ -1,20 +1,20 @@ define(['react', 'classnames'], (React, classNames) => { - const ListingGroups = React.createClass({ - handleSelect: function (group) { - return this.props.onSelectGroup(group); - }, - render: function () { - const groups = this.props.groups.map((group, index) => { - if(group.name === 'trash' && group.count === 0) { - return false; - } + const ListingGroups = React.createClass({ + handleSelect: function (group) { + return this.props.onSelectGroup(group); + }, + render: function () { + const groups = this.props.groups.map((group, index) => { + if(group.name === 'trash' && group.count === 0) { + return false; + } - const classes = classNames( + const classes = classNames( { 'current' : (group.name === this.props.group) } ); - return ( + return (
  • {(index > 0) ? ' |' : ''} { {group.label} ({ group.count.toLocaleString() })
    • - ); - }); + ); + }); - return ( + return (
      { groups }
    - ); - } - }); + ); + } + }); - return ListingGroups; - } + return ListingGroups; +} ); diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx index 060716a52f..4a33ade847 100644 --- a/assets/js/src/listing/listing.jsx +++ b/assets/js/src/listing/listing.jsx @@ -137,7 +137,7 @@ const ListingItem = React.createClass({ let actions; if (this.props.group === 'trash') { - actions = ( + actions = (
    @@ -324,13 +324,13 @@ const Listing = React.createClass({ case 'filter': const filters = {}; value.split('&').map((pair) => { - const [k, v] = pair.split('='); - filters[k] = v; - } + const [k, v] = pair.split('='); + filters[k] = v; + } ); state.filter = filters; - break; + break; default: state[key] = value; } @@ -657,7 +657,7 @@ const Listing = React.createClass({ }, handleSelectItem: function (id, is_checked) { let selected_ids = this.state.selected_ids, - selection = false; + selection = false; if (is_checked) { selected_ids = jQuery.merge(selected_ids, [ id ]); diff --git a/assets/js/src/listing/pages.jsx b/assets/js/src/listing/pages.jsx index ade117bc75..9ac9fe145b 100644 --- a/assets/js/src/listing/pages.jsx +++ b/assets/js/src/listing/pages.jsx @@ -1,8 +1,8 @@ define([ - 'react', - 'classnames', - 'mailpoet' - ], ( + 'react', + 'classnames', + 'mailpoet' +], ( React, classNames, MailPoet diff --git a/assets/js/src/listing/search.jsx b/assets/js/src/listing/search.jsx index 05ff7a886d..f3a9cf9b93 100644 --- a/assets/js/src/listing/search.jsx +++ b/assets/js/src/listing/search.jsx @@ -1,7 +1,7 @@ define([ - 'mailpoet', - 'react' - ], ( + 'mailpoet', + 'react' +], ( MailPoet, React ) => { diff --git a/assets/js/src/newsletters/listings/notification.jsx b/assets/js/src/newsletters/listings/notification.jsx index 9bad65ad2b..3ee3b5646f 100644 --- a/assets/js/src/newsletters/listings/notification.jsx +++ b/assets/js/src/newsletters/listings/notification.jsx @@ -220,7 +220,7 @@ const NewsletterListNotification = React.createClass({ sendingFrequency = MailPoet.I18n.t('sendDaily').replace( '%$1s', timeOfDayValues[newsletter.options.timeOfDay] ); - break; + break; case 'weekly': sendingFrequency = MailPoet.I18n.t('sendWeekly').replace( @@ -228,7 +228,7 @@ const NewsletterListNotification = React.createClass({ ).replace( '%$2s', timeOfDayValues[newsletter.options.timeOfDay] ); - break; + break; case 'monthly': sendingFrequency = MailPoet.I18n.t('sendMonthly').replace( @@ -236,7 +236,7 @@ const NewsletterListNotification = React.createClass({ ).replace( '%$2s', timeOfDayValues[newsletter.options.timeOfDay] ); - break; + break; case 'nthWeekDay': sendingFrequency = MailPoet.I18n.t('sendNthWeekDay').replace( @@ -246,11 +246,11 @@ const NewsletterListNotification = React.createClass({ ).replace( '%$3s', timeOfDayValues[newsletter.options.timeOfDay] ); - break; + break; case 'immediately': sendingFrequency = MailPoet.I18n.t('sendImmediately'); - break; + break; } } diff --git a/assets/js/src/newsletters/listings/welcome.jsx b/assets/js/src/newsletters/listings/welcome.jsx index a7f7458bd6..5740afd7c4 100644 --- a/assets/js/src/newsletters/listings/welcome.jsx +++ b/assets/js/src/newsletters/listings/welcome.jsx @@ -191,7 +191,7 @@ const NewsletterListWelcome = React.createClass({ '%$1s', mailpoet_roles[newsletter.options.role] ); } - break; + break; case 'segment': // get segment @@ -210,7 +210,7 @@ const NewsletterListWelcome = React.createClass({ '%$1s', segment.name ); } - break; + break; } // set sending delay @@ -221,19 +221,19 @@ const NewsletterListWelcome = React.createClass({ sendingDelay = MailPoet.I18n.t('sendingDelayHours').replace( '%$1d', newsletter.options.afterTimeNumber ); - break; + break; case 'days': sendingDelay = MailPoet.I18n.t('sendingDelayDays').replace( '%$1d', newsletter.options.afterTimeNumber ); - break; + break; case 'weeks': sendingDelay = MailPoet.I18n.t('sendingDelayWeeks').replace( '%$1d', newsletter.options.afterTimeNumber ); - break; + break; } sendingEvent += ' [' + sendingDelay + ']'; } diff --git a/assets/js/src/newsletters/scheduling/common.jsx b/assets/js/src/newsletters/scheduling/common.jsx index 43f6b1a07c..ff3b4e291a 100644 --- a/assets/js/src/newsletters/scheduling/common.jsx +++ b/assets/js/src/newsletters/scheduling/common.jsx @@ -28,11 +28,11 @@ const _timeOfDayValues = _.object(_.map( _.times(numberOfTimeSteps,(step) => { return step * TIME_STEP_SECONDS; }), (seconds) => { - const date = new Date(null); - date.setSeconds(seconds); - const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 }); - return [seconds, timeLabel]; - }) + const date = new Date(null); + date.setSeconds(seconds); + const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 }); + return [seconds, timeLabel]; +}) ); const _weekDayValues = { @@ -51,19 +51,19 @@ const _monthDayValues = _.object( _.times(NUMBER_OF_DAYS_IN_MONTH, (day) => { return day; }), (day) => { - const labels = { - 0: MailPoet.I18n.t('first'), - 1: MailPoet.I18n.t('second'), - 2: MailPoet.I18n.t('third') - }; - let label; - if (labels[day] !== undefined) { - label = labels[day]; - } else { - label = MailPoet.I18n.t('nth').replace("%$1d", day + 1); - } - return [day + 1, label]; + const labels = { + 0: MailPoet.I18n.t('first'), + 1: MailPoet.I18n.t('second'), + 2: MailPoet.I18n.t('third') + }; + let label; + if (labels[day] !== undefined) { + label = labels[day]; + } else { + label = MailPoet.I18n.t('nth').replace("%$1d", day + 1); } + return [day + 1, label]; + } ) ); diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 57ac1026a2..3c276a0c0c 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -178,8 +178,8 @@ define( // Store only properties that can be changed on this page const IGNORED_NEWSLETTER_PROPERTIES = [ - 'preheader', 'body', 'created_at', 'deleted_at', 'hash', - 'status', 'updated_at', 'type' + 'preheader', 'body', 'created_at', 'deleted_at', 'hash', + 'status', 'updated_at', 'type' ]; const newsletterData = _.omit( data, diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx index cc64af431f..580c3de426 100644 --- a/assets/js/src/newsletters/templates.jsx +++ b/assets/js/src/newsletters/templates.jsx @@ -185,7 +185,7 @@ define( } }); } else { - this.setState({ loading: false }); + this.setState({ loading: false }); } }, handleShowTemplate: function (template) { diff --git a/assets/js/src/newsletters/types/welcome/scheduling.jsx b/assets/js/src/newsletters/types/welcome/scheduling.jsx index c83dcc9728..02d6ac174c 100644 --- a/assets/js/src/newsletters/types/welcome/scheduling.jsx +++ b/assets/js/src/newsletters/types/welcome/scheduling.jsx @@ -109,15 +109,15 @@ const WelcomeScheduling = React.createClass({ options: this.state } }).done((response) => { - this.showTemplateSelection(response.data.id); - }).fail((response) => { - if (response.errors.length > 0) { - MailPoet.Notice.error( + this.showTemplateSelection(response.data.id); + }).fail((response) => { + if (response.errors.length > 0) { + MailPoet.Notice.error( response.errors.map((error) => { return error.message; }), { scroll: true } ); - } - }); + } + }); }, showTemplateSelection: function (newsletterId) { this.context.router.push(`/template/${ newsletterId }`); diff --git a/assets/js/src/subscribers/form.jsx b/assets/js/src/subscribers/form.jsx index ad05bc6f1c..4d9fff5b90 100644 --- a/assets/js/src/subscribers/form.jsx +++ b/assets/js/src/subscribers/form.jsx @@ -128,11 +128,11 @@ define( field.year_placeholder = MailPoet.I18n.t('year'); field.month_placeholder = MailPoet.I18n.t('month'); field.day_placeholder = MailPoet.I18n.t('day'); - break; + break; case 'select': field.placeholder = '-'; - break; + break; } fields.push(field); diff --git a/assets/js/src/subscribers/list.jsx b/assets/js/src/subscribers/list.jsx index d546b88445..9f02e5a91a 100644 --- a/assets/js/src/subscribers/list.jsx +++ b/assets/js/src/subscribers/list.jsx @@ -265,19 +265,19 @@ const SubscriberList = React.createClass({ switch(subscriber.status) { case 'subscribed': status = MailPoet.I18n.t('subscribed'); - break; + break; case 'unconfirmed': status = MailPoet.I18n.t('unconfirmed'); - break; + break; case 'unsubscribed': status = MailPoet.I18n.t('unsubscribed'); - break; + break; case 'bounced': status = MailPoet.I18n.t('bounced'); - break; + break; } let segments = false;