Fix ES6 space-infix-ops eslint rule [MAILPOET-1082]

.eslintrc.es6.json

@@ -65,7 +65,6 @@
     "no-script-url": 0,
     "wrap-iife": 0,
     "vars-on-top": 0,
-    "space-infix-ops": 0,
     "no-irregular-whitespace": 0,
     "padded-blocks": 0,
     "no-underscore-dangle": 0

assets/js/src/form/fields/field.jsx

@@ -113,7 +113,7 @@ define([
         <tr>
           <th scope="row">
             <label
-              htmlFor={'field_'+this.props.field.name}
+              htmlFor={'field_' + this.props.field.name}
             >
               { this.props.field.label }
               { tip }

assets/js/src/form/fields/select.jsx

@@ -61,7 +61,7 @@ const FormFieldSelect = React.createClass({
     return (
       <select
         name={this.props.field.name}
-        id={'field_'+this.props.field.name}
+        id={'field_' + this.props.field.name}
         value={this.props.item[this.props.field.name]}
         onChange={this.props.onValueChange}
         {...this.props.field.validation}

assets/js/src/form/fields/selection.jsx

@@ -35,7 +35,7 @@ define([
         (this.props.item !== undefined && prevProps.item !== undefined)
         && (this.props.item.id !== prevProps.item.id)
       ) {
-        jQuery('#'+this.refs.select.id)
+        jQuery('#' + this.refs.select.id)
           .val(this.getSelectedValues())
           .trigger('change');
       }
@@ -47,7 +47,7 @@ define([
     },
     destroySelect2: function () {
       if (this.isSelect2Initialized()) {
-        jQuery('#'+this.refs.select.id).select2('destroy');
+        jQuery('#' + this.refs.select.id).select2('destroy');
       }
     },
     setupSelect2: function () {
@@ -55,7 +55,7 @@ define([
         return;
       }
 
-      const select2 = jQuery('#'+this.refs.select.id).select2({
+      const select2 = jQuery('#' + this.refs.select.id).select2({
         width: (this.props.width || ''),
         templateResult: function (item) {
           if (item.element && item.element.selected) {
@@ -102,8 +102,8 @@ define([
       return null;
     },
     loadCachedItems: function () {
-      if (typeof (window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
+      if (typeof (window['mailpoet_' + this.props.field.endpoint]) !== 'undefined') {
-        let items = window['mailpoet_'+this.props.field.endpoint];
+        let items = window['mailpoet_' + this.props.field.endpoint];
 
 
         if (this.props.field['filter'] !== undefined) {
@@ -119,7 +119,7 @@ define([
       let value;
       if (this.props.onValueChange !== undefined) {
         if (this.props.field.multiple) {
-          value = jQuery('#'+this.refs.select.id).val();
+          value = jQuery('#' + this.refs.select.id).val();
         } else {
           value = e.target.value;
         }
@@ -168,7 +168,7 @@ define([
 
         return (
           <option
-            key={'option-'+index}
+            key={'option-' + index}
             value={value}
             title={searchLabel}
           >

assets/js/src/form/fields/text.jsx

@@ -22,7 +22,7 @@ const FormFieldText = React.createClass({
           : false
         }
         name={this.props.field.name}
-        id={'field_'+this.props.field.name}
+        id={'field_' + this.props.field.name}
         value={value}
         placeholder={this.props.field.placeholder}
         onChange={this.props.onValueChange}

assets/js/src/form/fields/textarea.jsx

@@ -11,7 +11,7 @@ define([
           type="text"
           className="regular-text"
           name={this.props.field.name}
-          id={'field_'+this.props.field.name}
+          id={'field_' + this.props.field.name}
           value={this.props.item[this.props.field.name]}
           placeholder={this.props.field.placeholder}
           defaultValue={this.props.field.defaultValue}

assets/js/src/form/form.jsx

@@ -159,7 +159,7 @@ define(
         if (this.getErrors() !== undefined) {
           errors = this.getErrors().map((error, index) => {
             return (
-              <p key={'error-'+index} className="mailpoet_error">
+              <p key={'error-' + index} className="mailpoet_error">
                 { error.message }
               </p>
             );
@@ -197,7 +197,7 @@ define(
               field={field}
               item={this.getValues()}
               onValueChange={onValueChange}
-              key={'field-'+i} />
+              key={'field-' + i} />
           );
         });
 

assets/js/src/help/tabs.jsx

@@ -26,7 +26,7 @@ function Tabs(props) {
 
     return (
       <Link
-        key={'tab-'+index}
+        key={'tab-' + index}
         className={tabClasses}
         to={tab.link}
       >{ tab.label }</Link>

assets/js/src/listing/filters.jsx

@@ -12,7 +12,7 @@ define([
     handleFilterAction: function () {
       const filters = {};
       this.getAvailableFilters().map((filter, i) => {
-        filters[this.refs['filter-'+i].name] = this.refs['filter-'+i].value;
+        filters[this.refs['filter-' + i].name] = this.refs['filter-' + i].value;
       });
       if (this.props.onBeforeSelectFilter) {
         this.props.onBeforeSelectFilter(filters);
@@ -39,7 +39,7 @@ define([
       this.getAvailableFilters().map(
         (filter, i) => {
           if (selected_filters[filter] !== undefined && selected_filters[filter]) {
-            jQuery(this.refs['filter-'+i])
+            jQuery(this.refs['filter-' + i])
               .val(selected_filters[filter])
               .trigger('change');
           }

assets/js/src/listing/listing.jsx

@@ -74,7 +74,7 @@ const ListingItem = React.createClass({
 
         if (action.name === 'trash') {
           custom_action = (
-            <span key={'action-'+index} className="trash">
+            <span key={'action-' + index} className="trash">
               {(!is_first) ? ' | ' : ''}
               <a
                 href="javascript:;"
@@ -90,7 +90,7 @@ const ListingItem = React.createClass({
           custom_action = (
             <span
               onClick={this.props.onRefreshItems}
-              key={'action-'+index} className={action.name}>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
@@ -98,7 +98,7 @@ const ListingItem = React.createClass({
         } else if (action.link) {
           custom_action = (
             <span
-              key={'action-'+index} className={action.name}>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
@@ -106,7 +106,7 @@ const ListingItem = React.createClass({
         } else {
           custom_action = (
             <span
-              key={'action-'+index} className={action.name}>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               <a href="javascript:;" onClick={
                 (action.onClick !== undefined)
@@ -423,8 +423,8 @@ const Listing = React.createClass({
     if (ret.indexOf(':') !== -1) {
       const params = this.getParams();
       Object.keys(params).map((key) => {
-        if (ret.indexOf(':'+key) !== -1) {
+        if (ret.indexOf(':' + key) !== -1) {
-          ret = ret.replace(':'+key, params[key]);
+          ret = ret.replace(':' + key, params[key]);
         }
       });
     }

assets/js/src/newsletters/breadcrumb.jsx

@@ -53,7 +53,7 @@ define(
           }
 
           return (
-            <span key={'step-'+index}>
+            <span key={'step-' + index}>
               <span className={stepClasses}>
                 { label }
               </span>

assets/js/src/newsletters/listings/mixins.jsx

@@ -19,8 +19,8 @@ const _QueueMixin = {
         newsletter_id: newsletter.id,
       },
     }).done(() => {
-      jQuery('#resume_'+newsletter.id).show();
+      jQuery('#resume_' + newsletter.id).show();
-      jQuery('#pause_'+newsletter.id).hide();
+      jQuery('#pause_' + newsletter.id).hide();
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
@@ -39,8 +39,8 @@ const _QueueMixin = {
         newsletter_id: newsletter.id,
       },
     }).done(() => {
-      jQuery('#pause_'+newsletter.id).show();
+      jQuery('#pause_' + newsletter.id).show();
-      jQuery('#resume_'+newsletter.id).hide();
+      jQuery('#resume_' + newsletter.id).hide();
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
@@ -95,18 +95,18 @@ const _QueueMixin = {
             { newsletter.queue.count_processed } / { newsletter.queue.count_total }
               
             <a
-              id={'resume_'+newsletter.id}
+              id={'resume_' + newsletter.id}
               className="button"
               style={{ display: (newsletter.queue.status === 'paused')
-                ? 'inline-block': 'none' }}
+                ? 'inline-block' : 'none' }}
               href="javascript:;"
               onClick={this.resumeSending.bind(null, newsletter)}
             >{MailPoet.I18n.t('resume')}</a>
             <a
-              id={'pause_'+newsletter.id}
+              id={'pause_' + newsletter.id}
               className="button mailpoet_pause"
               style={{ display: (newsletter.queue.status === null)
-                  ? 'inline-block': 'none' }}
+                  ? 'inline-block' : 'none' }}
               href="javascript:;"
               onClick={this.pauseSending.bind(null, newsletter)}
             >{MailPoet.I18n.t('pause')}</a>

assets/js/src/newsletters/listings/tabs.jsx

@@ -35,7 +35,7 @@ const ListingTabs = React.createClass({
 
       return (
         <Link
-          key={'tab-'+index}
+          key={'tab-' + index}
           className={tabClasses}
           to={tab.link}
           onClick={() => MailPoet.trackEvent(`Tab Emails > ${tab.name} clicked`,

assets/js/src/newsletters/send.jsx

@@ -324,7 +324,7 @@ define(
                  {MailPoet.I18n.t('orSimply')} 
                 <a
                   href={
-                    '?page=mailpoet-newsletter-editor&id='+this.props.params.id
+                    '?page=mailpoet-newsletter-editor&id=' + this.props.params.id
                   }
                   onClick={this.handleRedirectToDesign}>
                   {MailPoet.I18n.t('goBackToDesign')}

assets/js/src/newsletters/templates.jsx

@@ -238,7 +238,7 @@ define(
           }
 
           return (
-            <li key={'template-'+index}>
+            <li key={'template-' + index}>
               <div className="mailpoet_thumbnail">
                 { thumbnail }
               </div>

assets/js/src/subscribers/form.jsx

@@ -78,7 +78,7 @@ define(
           return !!(!segment.deleted_at && segment.type === 'default');
         },
         getLabel: function (segment) {
-          return segment.name + ' ('+ segment.subscribers +')';
+          return segment.name + ' (' + segment.subscribers + ')';
         },
         getSearchLabel: function (segment, subscriber) {
           let label = '';