Fix prefer-arrow-callback eslint rule

[MAILPOET-985]
2017-07-05 09:48:35 +01:00
parent 3ba857d03f
commit 4706c5fc25
36 changed files with 143 additions and 144 deletions
--- a/.eslintrc.es6.json
+++ b/.eslintrc.es6.json
@ -40,7 +40,6 @@
    "jsx-a11y/alt-text": 0,

    "comma-dangle": 0,
-    "prefer-arrow-callback": 0,
    "func-names": 0,
    "object-shorthand": 0,
    "no-bitwise": 0,
--- a/assets/js/src/form/fields/checkbox.jsx
+++ b/assets/js/src/form/fields/checkbox.jsx
@ -1,9 +1,9 @@
 define([
  'react'
 ],
-function (
+(
  React
-) {
+) => {
  const FormFieldCheckbox = React.createClass({
    onValueChange: function (e) {
      e.target.value = this.refs.checkbox.checked ? '1' : '0';
--- a/assets/js/src/form/fields/date.jsx
+++ b/assets/js/src/form/fields/date.jsx
@ -1,10 +1,10 @@
 define([
  'react',
  'moment',
-], function (
+], (
  React,
  Moment
-) {
+) => {
  class FormFieldDateYear extends React.Component {
    render() {
      const yearsRange = 100;
--- a/assets/js/src/form/fields/field.jsx
+++ b/assets/js/src/form/fields/field.jsx
@ -8,7 +8,7 @@ define([
  'form/fields/selection.jsx',
  'form/fields/date.jsx',
 ],
-function (
+(
  React,
  FormFieldText,
  FormFieldTextarea,
@ -17,7 +17,7 @@ function (
  FormFieldCheckbox,
  FormFieldSelection,
  FormFieldDate
-) {
+) => {
  var FormField = React.createClass({
    renderField: function (data, inline = false) {
      var description = false;
@ -87,14 +87,14 @@ function (
      var field = false;

      if(this.props.field['fields'] !== undefined) {
-        field = this.props.field.fields.map(function (subfield, index) {
+        field = this.props.field.fields.map((subfield, index) => {
          return this.renderField({
            index: index,
            field: subfield,
            item: this.props.item,
            onValueChange: this.props.onValueChange || false
          });
-        }.bind(this));
+        });
      } else {
        field = this.renderField(this.props);
      }
--- a/assets/js/src/form/fields/radio.jsx
+++ b/assets/js/src/form/fields/radio.jsx
@ -1,9 +1,9 @@
 define([
  'react'
 ],
-function (
+(
  React
-) {
+) => {
  const FormFieldRadio = React.createClass({
    render: function () {
      if (this.props.field.values === undefined) {
--- a/assets/js/src/form/fields/selection.jsx
+++ b/assets/js/src/form/fields/selection.jsx
@ -4,11 +4,11 @@ define([
  'jquery',
  'select2'
 ],
-function (
+(
  React,
  ReactDOM,
  jQuery
-) {
+) => {
  var Selection = React.createClass({
    getInitialState: function () {
      return {
@ -71,10 +71,10 @@ function (
      });

      var hasRemoved = false;
-      select2.on('select2:unselecting', function () {
+      select2.on('select2:unselecting', () => {
        hasRemoved = true;
      });
-      select2.on('select2:opening', function (e) {
+      select2.on('select2:opening', (e) => {
        if(hasRemoved === true) {
          hasRemoved = false;
          e.preventDefault();
@ -91,7 +91,7 @@ function (
      } else if(this.props.item !== undefined && this.props.field.name !== undefined) {
        if (this.allowMultipleValues()) {
          if (Array.isArray(this.props.item[this.props.field.name])) {
-            return this.props.item[this.props.field.name].map(function (item) {
+            return this.props.item[this.props.field.name].map((item) => {
              return item.id;
            });
          }
--- a/assets/js/src/form/fields/textarea.jsx
+++ b/assets/js/src/form/fields/textarea.jsx
@ -1,9 +1,9 @@
 define([
  'react'
 ],
-function (
+(
  React
-) {
+) => {
  var FormFieldTextarea = React.createClass({
    render: function () {
      return (
--- a/assets/js/src/form/form.jsx
+++ b/assets/js/src/form/form.jsx
@ -6,13 +6,13 @@ define(
    'react-router',
    'form/fields/field.jsx'
  ],
-  function (
+  (
    React,
    MailPoet,
    classNames,
    Router,
    FormField
-  ) {
+  ) => {

    var Form = React.createClass({
      contextTypes: {
@ -98,15 +98,15 @@ define(

        // only get values from displayed fields
        var item = {};
-        this.props.fields.map(function (field) {
+        this.props.fields.map((field) => {
          if(field['fields'] !== undefined) {
-            field.fields.map(function (subfield) {
+            field.fields.map((subfield) => {
              item[subfield.name] = this.state.item[subfield.name];
-            }.bind(this));
+            });
          } else {
            item[field.name] = this.state.item[field.name];
          }
-        }.bind(this));
+        });
        // set id if specified
        if(this.props.params.id !== undefined) {
          item.id = this.props.params.id;
@ -154,7 +154,7 @@ define(
      },
      render: function () {
        if(this.getErrors() !== undefined) {
-          var errors = this.getErrors().map(function (error, index) {
+          var errors = this.getErrors().map((error, index) => {
            return (
              <p key={ 'error-'+index } className="mailpoet_error">
                { error.message }
@ -179,7 +179,7 @@ define(
          afterFormContent = this.props.afterFormContent(this.getValues());
        }

-        var fields = this.props.fields.map(function (field, i) {
+        var fields = this.props.fields.map((field, i) => {
          return (
            <FormField
              field={ field }
@ -187,7 +187,7 @@ define(
              onValueChange={ this.handleValueChange }
              key={ 'field-'+i } />
          );
-        }.bind(this));
+        });

        var actions = false;
        if(this.props.children) {
--- a/assets/js/src/forms/list.jsx
+++ b/assets/js/src/forms/list.jsx
@ -109,7 +109,7 @@ const item_actions = [
      }).fail((response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
@ -132,7 +132,7 @@ const FormList = React.createClass({
    }).fail((response) => {
      if (response.errors.length > 0) {
        MailPoet.Notice.error(
-          response.errors.map(function (error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
          { scroll: true }
        );
      }
@ -145,9 +145,9 @@ const FormList = React.createClass({
      'has-row-actions'
    );

-    let segments = mailpoet_segments.filter(function (segment) {
+    let segments = mailpoet_segments.filter((segment) => {
      return (jQuery.inArray(segment.id, form.segments) !== -1);
-    }).map(function (segment) {
+    }).map((segment) => {
      return segment.name;
    }).join(', ');

--- a/assets/js/src/listing/bulk_actions.jsx
+++ b/assets/js/src/listing/bulk_actions.jsx
@ -2,10 +2,10 @@ define([
  'react',
  'mailpoet'
 ],
-function (
+(
  React,
  MailPoet
-) {
+) => {
  var ListingBulkActions = React.createClass({
    getInitialState: function () {
      return {
@ -17,7 +17,7 @@ function (
      this.setState({
        action: e.target.value,
        extra: false
-      }, function () {
+      }, () => {
        var action = this.getSelectedAction();

        // action on select callback
@ -26,7 +26,7 @@ function (
            extra: action.onSelect(e)
          });
        }
-      }.bind(this));
+      });
    },
    handleApplyAction: function (e) {
      e.preventDefault();
@ -67,7 +67,7 @@ function (
    getSelectedAction: function () {
      var selected_action = this.refs.action.value;
      if(selected_action.length > 0) {
-        var action = this.props.bulk_actions.filter(function (action) {
+        var action = this.props.bulk_actions.filter((action) => {
          return (action.name === selected_action);
        });

@ -97,14 +97,14 @@ function (
            onChange={this.handleChangeAction}
          >
            <option value="">{MailPoet.I18n.t('bulkActions')}</option>
-            { this.props.bulk_actions.map(function (action, index) {
+            { this.props.bulk_actions.map((action, index) => {
              return (
                <option
                  value={ action.name }
                  key={ 'action-' + index }
                >{ action.label }</option>
              );
-            }.bind(this)) }
+            }) }
          </select>
          <input
            onClick={ this.handleApplyAction }
--- a/assets/js/src/listing/filters.jsx
+++ b/assets/js/src/listing/filters.jsx
@ -3,11 +3,11 @@ define([
  'jquery',
  'mailpoet'
 ],
-function (
+(
  React,
  jQuery,
  MailPoet
-) {
+) => {
  var ListingFilters = React.createClass({
    handleFilterAction: function () {
      let filters = {};
@ -21,7 +21,7 @@ function (
    },
    getAvailableFilters: function () {
      let filters = this.props.filters;
-      return Object.keys(filters).filter(function (filter) {
+      return Object.keys(filters).filter((filter) => {
        return !(
          filters[filter].length === 0
          || (
@ -34,24 +34,24 @@ function (
    render: function () {
      const filters = this.props.filters;
      const available_filters = this.getAvailableFilters()
-        .map(function (filter, i) {
+        .map((filter, i) => {
          return (
            <select
              ref={ `filter-${i}` }
              key={ `filter-${i}` }
              name={ filter }
            >
-            { filters[filter].map(function (option, j) {
+            { filters[filter].map((option, j) => {
              return (
                <option
                  value={ option.value }
                  key={ 'filter-option-' + j }
                >{ option.label }</option>
              );
-            }.bind(this)) }
+            }) }
            </select>
          );
-      }.bind(this));
+      });

      let button;

--- a/assets/js/src/listing/groups.jsx
+++ b/assets/js/src/listing/groups.jsx
@ -1,11 +1,11 @@
-define(['react', 'classnames'], function (React, classNames) {
+define(['react', 'classnames'], (React, classNames) => {

    var ListingGroups = React.createClass({
      handleSelect: function (group) {
        return this.props.onSelectGroup(group);
      },
      render: function () {
-        var groups = this.props.groups.map(function (group, index) {
+        var groups = this.props.groups.map((group, index) => {
          if(group.name === 'trash' && group.count === 0) {
            return false;
          }
@ -25,7 +25,7 @@ define(['react', 'classnames'], function (React, classNames) {
              </a>
            </li>
          );
-        }.bind(this));
+        });

        return (
          <ul className="subsubsub">
--- a/assets/js/src/listing/header.jsx
+++ b/assets/js/src/listing/header.jsx
@ -9,7 +9,7 @@ const ListingHeader = React.createClass({
    );
  },
  render: function () {
-    const columns = this.props.columns.map(function (column, index) {
+    const columns = this.props.columns.map((column, index) => {
      column.is_primary = (index === 0);
      column.sorted = (this.props.sort_by === column.name)
        ? this.props.sort_order
@ -21,7 +21,7 @@ const ListingHeader = React.createClass({
          key={ 'column-' + index }
          column={column} />
      );
-    }.bind(this));
+    });

    let checkbox;

--- a/assets/js/src/listing/listing.jsx
+++ b/assets/js/src/listing/listing.jsx
@ -63,7 +63,7 @@ const ListingItem = React.createClass({

    if (custom_actions.length > 0) {
      let is_first = true;
-      item_actions = custom_actions.map(function (action, index) {
+      item_actions = custom_actions.map((action, index) => {
        if (action.display !== undefined) {
          if (action.display(this.props.item) === false) {
            return;
@ -125,7 +125,7 @@ const ListingItem = React.createClass({
        }

        return custom_action;
-      }.bind(this));
+      });
    } else {
      item_actions = (
        <span className="edit">
@ -259,7 +259,7 @@ const ListingItems = React.createClass({
            </td>
          </tr>

-          {this.props.items.map(function (item, index) {
+          {this.props.items.map((item, index) => {
            item.id = parseInt(item.id, 10);
            item.selected = (this.props.selected_ids.indexOf(item.id) !== -1);

@ -279,7 +279,7 @@ const ListingItems = React.createClass({
                key={ `item-${item.id}-${index}` }
                item={ item } />
            );
-          }.bind(this))}
+          })}
        </tbody>
      );
    }
@ -323,7 +323,7 @@ const Listing = React.createClass({
        switch(key) {
          case 'filter':
            let filters = {};
-            value.split('&').map(function (pair) {
+            value.split('&').map((pair) => {
                let [k, v] = pair.split('=');
                filters[k] = v;
              }
@ -352,9 +352,9 @@ const Listing = React.createClass({
      state.sort_order = this.props.sort_order;
    }

-    this.setState(state, function () {
+    this.setState(state, () => {
      this.getItems();
-    }.bind(this));
+    });
  },
  getParams: function () {
    // get all route parameters (without the "splat")
@ -435,9 +435,9 @@ const Listing = React.createClass({
      this.initWithParams(params);

      if (this.props.auto_refresh) {
-        jQuery(document).on('heartbeat-tick.mailpoet', function () {
+        jQuery(document).on('heartbeat-tick.mailpoet', () => {
          this.getItems();
-        }.bind(this));
+        });
      }
    }
  },
@ -489,7 +489,7 @@ const Listing = React.createClass({
      }).fail((response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
@ -519,7 +519,7 @@ const Listing = React.createClass({
      this.getItems();
    }).fail((response) => {
      MailPoet.Notice.error(
-        response.errors.map(function (error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
        { scroll: true }
      );
    });
@ -547,7 +547,7 @@ const Listing = React.createClass({
      this.getItems();
    }).fail((response) => {
      MailPoet.Notice.error(
-        response.errors.map(function (error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
        { scroll: true }
      );
    });
@ -575,7 +575,7 @@ const Listing = React.createClass({
      this.getItems();
    }).fail((response) => {
      MailPoet.Notice.error(
-        response.errors.map(function (error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
        { scroll: true }
      );
    });
@ -592,7 +592,7 @@ const Listing = React.createClass({
      this.handleGroup('all');
    }).fail((response) => {
      MailPoet.Notice.error(
-        response.errors.map(function (error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
        { scroll: true }
      );
    });
@ -636,17 +636,17 @@ const Listing = React.createClass({
      page: 1,
      selection: false,
      selected_ids: []
-    }, function () {
+    }, () => {
      this.setParams();
-    }.bind(this));
+    });
  },
  handleSort: function (sort_by, sort_order = 'asc') {
    this.setState({
      sort_by: sort_by,
      sort_order: (sort_order === 'asc') ? 'asc' : 'desc',
-    }, function () {
+    }, () => {
      this.setParams();
-    }.bind(this));
+    });
  },
  handleSelectItem: function (id, is_checked) {
    var selected_ids = this.state.selected_ids,
@ -673,7 +673,7 @@ const Listing = React.createClass({
    if (is_checked === false) {
      this.clearSelection();
    } else {
-      var selected_ids = this.state.items.map(function (item) {
+      var selected_ids = this.state.items.map((item) => {
        return ~~item.id;
      });

@ -703,9 +703,9 @@ const Listing = React.createClass({
    this.setState({
      filter: filters,
      page: 1
-    }, function () {
+    }, () => {
      this.setParams();
-    }.bind(this));
+    });
  },
  handleGroup: function (group) {
    // reset search
@ -716,18 +716,18 @@ const Listing = React.createClass({
      filter: {},
      search: '',
      page: 1
-    }, function () {
+    }, () => {
      this.setParams();
-    }.bind(this));
+    });
  },
  handleSetPage: function (page) {
    this.setState({
      page: page,
      selection: false,
      selected_ids: []
-    }, function () {
+    }, () => {
      this.setParams();
-    }.bind(this));
+    });
  },
  handleRenderItem: function (item, actions) {
    const render = this.props.onRenderItem(item, actions, this.state.meta);
@ -743,7 +743,7 @@ const Listing = React.createClass({

    // columns
    let columns = this.props.columns || [];
-    columns = columns.filter(function (column) {
+    columns = columns.filter((column) => {
      return (column.display === undefined || !!(column.display) === true);
    });

--- a/assets/js/src/listing/pages.jsx
+++ b/assets/js/src/listing/pages.jsx
@ -2,11 +2,11 @@ define([
    'react',
    'classnames',
    'mailpoet'
-  ], function (
+  ], (
    React,
    classNames,
    MailPoet
-  ) {
+  ) => {

  var ListingPages = React.createClass({
    getInitialState: function () {
@ -17,9 +17,9 @@ define([
    setPage: function (page) {
      this.setState({
        page: null
-      }, function () {
+      }, () => {
        this.props.onSetPage(this.constrainPage(page));
-      }.bind(this));
+      });
    },
    setFirstPage: function () {
      this.setPage(1);
--- a/assets/js/src/listing/search.jsx
+++ b/assets/js/src/listing/search.jsx
@ -1,10 +1,10 @@
 define([
    'mailpoet',
    'react'
-  ], function (
+  ], (
    MailPoet,
    React
-  ) {
+  ) => {

  var ListingSearch = React.createClass({
    handleSearch: function (e) {
--- a/assets/js/src/newsletters/breadcrumb.jsx
+++ b/assets/js/src/newsletters/breadcrumb.jsx
@ -5,12 +5,12 @@ define(
    'classnames',
    'mailpoet'
  ],
-  function (
+  (
    React,
    Router,
    classNames,
    MailPoet
-  ) {
+  ) => {
    var Link = Router.Link;

    var Breadcrumb = React.createClass({
@ -39,7 +39,7 @@ define(
        };
      },
      render: function () {
-        var steps = this.state.steps.map(function (step, index) {
+        var steps = this.state.steps.map((step, index) => {
          var stepClasses = classNames(
            { 'mailpoet_current': (this.props.step === step.name) }
          );
@ -60,7 +60,7 @@ define(
              { (index < (this.state.steps.length - 1) ) ? ' > ' : '' }
            </span>
          );
-        }.bind(this));
+        });

        return (
          <p className="mailpoet_breadcrumb">
--- a/assets/js/src/newsletters/listings/mixins.jsx
+++ b/assets/js/src/newsletters/listings/mixins.jsx
@ -18,13 +18,13 @@ const _QueueMixin = {
      data: {
        newsletter_id: newsletter.id
      }
-    }).done(function () {
+    }).done(() => {
      jQuery('#resume_'+newsletter.id).show();
      jQuery('#pause_'+newsletter.id).hide();
    }).fail((response) => {
      if (response.errors.length > 0) {
        MailPoet.Notice.error(
-          response.errors.map(function (error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
          { scroll: true }
        );
      }
@ -38,13 +38,13 @@ const _QueueMixin = {
      data: {
        newsletter_id: newsletter.id
      }
-    }).done(function () {
+    }).done(() => {
      jQuery('#pause_'+newsletter.id).show();
      jQuery('#resume_'+newsletter.id).hide();
    }).fail((response) => {
      if (response.errors.length > 0) {
        MailPoet.Notice.error(
-          response.errors.map(function (error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
          { scroll: true }
        );
      }
@ -356,14 +356,14 @@ const _MailerMixin = {
      api_version: window.mailpoet_api_version,
      endpoint: 'mailer',
      action: 'resumeSending'
-    }).done(function () {
+    }).done(() => {
      MailPoet.Notice.hide('mailpoet_mailer_error');
      MailPoet.Notice.success(MailPoet.I18n.t('mailerSendingResumedNotice'));
      window.mailpoet_listing.forceUpdate();
    }).fail((response) => {
      if (response.errors.length > 0) {
        MailPoet.Notice.error(
-          response.errors.map(function (error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
          { scroll: true }
        );
      }
--- a/assets/js/src/newsletters/listings/notification.jsx
+++ b/assets/js/src/newsletters/listings/notification.jsx
@ -141,7 +141,7 @@ const newsletter_actions = [
      }).fail((response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
@ -198,7 +198,7 @@ const NewsletterListNotification = React.createClass({
    let sendingToSegments;

    // get list of segments' name
-    const segments = newsletter.segments.map(function (segment) {
+    const segments = newsletter.segments.map((segment) => {
      return segment.name;
    });

--- a/assets/js/src/newsletters/listings/notification_history.jsx
+++ b/assets/js/src/newsletters/listings/notification_history.jsx
@ -68,7 +68,7 @@ const NewsletterListNotificationHistory = React.createClass({
      'has-row-actions'
    );

-    const segments = newsletter.segments.map(function (segment) {
+    const segments = newsletter.segments.map((segment) => {
      return segment.name;
    }).join(', ');

--- a/assets/js/src/newsletters/listings/standard.jsx
+++ b/assets/js/src/newsletters/listings/standard.jsx
@ -139,7 +139,7 @@ let newsletter_actions = [
      }).fail((response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
@ -162,7 +162,7 @@ const NewsletterListStandard = React.createClass({
      'has-row-actions'
    );

-    const segments = newsletter.segments.map(function (segment) {
+    const segments = newsletter.segments.map((segment) => {
      return segment.name;
    }).join(', ');

--- a/assets/js/src/newsletters/listings/welcome.jsx
+++ b/assets/js/src/newsletters/listings/welcome.jsx
@ -196,7 +196,7 @@ const NewsletterListWelcome = React.createClass({

      case 'segment':
        // get segment
-        const segment = _.find(mailpoet_segments, function (segment) {
+        const segment = _.find(mailpoet_segments, (segment) => {
          return (~~(segment.id) === ~~(newsletter.options.segment));
        });

--- a/assets/js/src/newsletters/scheduling/common.jsx
+++ b/assets/js/src/newsletters/scheduling/common.jsx
@ -25,9 +25,9 @@ const TIME_STEP_SECONDS = 3600;
 const numberOfTimeSteps = SECONDS_IN_DAY / TIME_STEP_SECONDS;

 const _timeOfDayValues = _.object(_.map(
-  _.times(numberOfTimeSteps,function (step) {
+  _.times(numberOfTimeSteps,(step) => {
    return step * TIME_STEP_SECONDS;
-  }), function (seconds) {
+  }), (seconds) => {
    let date = new Date(null);
    date.setSeconds(seconds);
    const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 });
@ -48,9 +48,9 @@ const _weekDayValues = {
 const NUMBER_OF_DAYS_IN_MONTH = 28;
 const _monthDayValues = _.object(
  _.map(
-    _.times(NUMBER_OF_DAYS_IN_MONTH, function (day) {
+    _.times(NUMBER_OF_DAYS_IN_MONTH, (day) => {
      return day;
-    }), function (day) {
+    }), (day) => {
      const labels = {
        0: MailPoet.I18n.t('first'),
        1: MailPoet.I18n.t('second'),
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@ -10,7 +10,7 @@ define(
    'newsletters/send/welcome.jsx',
    'newsletters/breadcrumb.jsx'
  ],
-  function (
+  (
    React,
    Router,
    _,
@ -20,7 +20,7 @@ define(
    NotificationNewsletterFields,
    WelcomeNewsletterFields,
    Breadcrumb
-  ) {
+  ) => {

    var NewsletterSend = React.createClass({
      contextTypes: {
@ -198,7 +198,7 @@ define(
      _showError: (response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
--- a/assets/js/src/newsletters/send/notification.jsx
+++ b/assets/js/src/newsletters/send/notification.jsx
@ -5,12 +5,12 @@ define(
    'newsletters/types/notification/scheduling.jsx',
    'underscore'
  ],
-  function (
+  (
    MailPoet,
    Hooks,
    Scheduling,
    _
-  ) {
+  ) => {

    var fields = [
      {
@ -47,8 +47,8 @@ define(
        },
        transformChangedValue: function (segment_ids) {
          var all_segments = this.state.items;
-          return _.map(segment_ids, function (id) {
-            return _.find(all_segments, function (segment) {
+          return _.map(segment_ids, (id) => {
+            return _.find(all_segments, (segment) => {
              return segment.id === id;
            });
          });
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@ -6,13 +6,13 @@ define(
    'mailpoet',
    'wp-js-hooks',
  ],
-  function (
+  (
    React,
    jQuery,
    _,
    MailPoet,
    Hooks
-  ) {
+  ) => {

    var currentTime = window.mailpoet_current_time || '00:00',
        defaultDateTime = window.mailpoet_current_date + ' ' + '00:00:00';
@ -346,8 +346,8 @@ define(
        },
        transformChangedValue: function (segment_ids) {
          var all_segments = this.state.items;
-          return _.map(segment_ids, function (id) {
-            return _.find(all_segments, function (segment) {
+          return _.map(segment_ids, (id) => {
+            return _.find(all_segments, (segment) => {
              return segment.id === id;
            });
          });
--- a/assets/js/src/newsletters/send/welcome.jsx
+++ b/assets/js/src/newsletters/send/welcome.jsx
@ -4,11 +4,11 @@ define(
    'wp-js-hooks',
    'newsletters/types/welcome/scheduling.jsx'
  ],
-  function (
+  (
    MailPoet,
    Hooks,
    Scheduling
-  ) {
+  ) => {


    var fields = [
--- a/assets/js/src/newsletters/templates.jsx
+++ b/assets/js/src/newsletters/templates.jsx
@ -7,14 +7,14 @@ define(
    'classnames',
    'newsletters/breadcrumb.jsx'
  ],
-  function (
+  (
    React,
    _,
    MailPoet,
    Router,
    classNames,
    Breadcrumb
-  ) {
+  ) => {

    var ImportTemplate = React.createClass({
      saveTemplate: function (template) {
@ -31,14 +31,14 @@ define(
          endpoint: 'newsletterTemplates',
          action: 'save',
          data: template
-        }).always(function () {
+        }).always(() => {
          MailPoet.Modal.loading(false);
        }).done((response) => {
          this.props.onImport(response.data);
        }).fail((response) => {
          if (response.errors.length > 0) {
            MailPoet.Notice.error(
-              response.errors.map(function (error) { return error.message; }),
+              response.errors.map((error) => { return error.message; }),
              { scroll: true }
            );
          }
@ -145,7 +145,7 @@ define(
        }).fail((response) => {
          if (response.errors.length > 0) {
            MailPoet.Notice.error(
-              response.errors.map(function (error) { return error.message; }),
+              response.errors.map((error) => { return error.message; }),
              { scroll: true }
            );
          }
@ -185,7 +185,7 @@ define(
        this.getTemplates();
      },
      render: function () {
-        var templates = this.state.templates.map(function (template, index) {
+        var templates = this.state.templates.map((template, index) => {
          var deleteLink = (
            <div className="mailpoet_delete">
              <a
@ -236,7 +236,7 @@ define(
              { (template.readonly === "1") ? false : deleteLink }
            </li>
          );
-        }.bind(this));
+        });

        var boxClasses = classNames(
          'mailpoet_boxes',
--- a/assets/js/src/newsletters/types.jsx
+++ b/assets/js/src/newsletters/types.jsx
@ -6,13 +6,13 @@ define(
    'react-router',
    'newsletters/breadcrumb.jsx'
  ],
-  function (
+  (
    React,
    MailPoet,
    Hooks,
    Router,
    Breadcrumb
-  ) {
+  ) => {
    var NewsletterTypes = React.createClass({
      contextTypes: {
        router: React.PropTypes.object.isRequired
@ -36,7 +36,7 @@ define(
        }).fail((response) => {
          if (response.errors.length > 0) {
            MailPoet.Notice.error(
-              response.errors.map(function (error) { return error.message; }),
+              response.errors.map((error) => { return error.message; }),
              { scroll: true }
            );
          }
@ -93,7 +93,7 @@ define(
            <Breadcrumb step="type" />

            <ul className="mailpoet_boxes clearfix">
-              {types.map(function (type, index) {
+              {types.map((type, index) => {
                return (
                  <li key={index} data-type={type.id}>
                    <div>
--- a/assets/js/src/newsletters/types/notification/notification.jsx
+++ b/assets/js/src/newsletters/types/notification/notification.jsx
@ -7,14 +7,14 @@ define(
    'newsletters/types/notification/scheduling.jsx',
    'newsletters/breadcrumb.jsx'
  ],
-  function (
+  (
    _,
    React,
    Router,
    MailPoet,
    Scheduling,
    Breadcrumb
-  ) {
+  ) => {

    var field = {
      name: 'options',
@ -56,7 +56,7 @@ define(
        }).fail((response) => {
          if (response.errors.length > 0) {
            MailPoet.Notice.error(
-              response.errors.map(function (error) { return error.message; }),
+              response.errors.map((error) => { return error.message; }),
              { scroll: true }
            );
          }
--- a/assets/js/src/newsletters/types/standard.jsx
+++ b/assets/js/src/newsletters/types/standard.jsx
@ -5,12 +5,12 @@ define(
    'mailpoet',
    'newsletters/breadcrumb.jsx'
  ],
-  function (
+  (
    React,
    Router,
    MailPoet,
    Breadcrumb
-  ) {
+  ) => {

    var NewsletterStandard = React.createClass({
      contextTypes: {
@ -33,7 +33,7 @@ define(
        }).fail((response) => {
          if (response.errors.length > 0) {
            MailPoet.Notice.error(
-              response.errors.map(function (error) { return error.message; }),
+              response.errors.map((error) => { return error.message; }),
              { scroll: true }
            );
          }
--- a/assets/js/src/newsletters/types/welcome/scheduling.jsx
+++ b/assets/js/src/newsletters/types/welcome/scheduling.jsx
@ -8,7 +8,7 @@ import { timeDelayValues } from 'newsletters/scheduling/common.jsx';
 const availableRoles = window.mailpoet_roles || {};
 const availableSegments = _.filter(
  window.mailpoet_segments || [],
-  function (segment) {
+  (segment) => {
    return segment.type === 'default';
  }
 );
@ -23,7 +23,7 @@ const events = {

 const availableSegmentValues = _.object(_.map(
  availableSegments,
-  function (segment) {
+  (segment) => {
    let name = segment.name + ' (' + parseInt(segment.subscribers, 10).toLocaleString() + ')';
    return [segment.id, name];
  }
@ -113,7 +113,7 @@ const WelcomeScheduling = React.createClass({
      }).fail((response) => {
        if (response.errors.length > 0) {
          MailPoet.Notice.error(
-            response.errors.map(function (error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
            { scroll: true }
          );
        }
--- a/assets/js/src/segments/form.jsx
+++ b/assets/js/src/segments/form.jsx
@ -5,12 +5,12 @@ define(
    'mailpoet',
    'form/form.jsx'
  ],
-  function (
+  (
    React,
    Router,
    MailPoet,
    Form
-  ) {
+  ) => {

    let fields = [
      {
--- a/assets/js/src/segments/list.jsx
+++ b/assets/js/src/segments/list.jsx
@ -124,7 +124,7 @@ const item_actions = [
        refresh();
      }).fail((response) => {
        MailPoet.Notice.error(
-          response.errors.map(function (error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
          { scroll: true }
        );
      });
@ -156,7 +156,7 @@ const item_actions = [
        api_version: window.mailpoet_api_version,
        endpoint: 'segments',
        action: 'synchronize'
-      }).done(function (response) {
+      }).done((response) => {
        MailPoet.Modal.loading(false);
        if(response === true) {
          MailPoet.Notice.success(
--- a/assets/js/src/subscribers/form.jsx
+++ b/assets/js/src/subscribers/form.jsx
@ -6,13 +6,13 @@ define(
    'form/form.jsx',
    'react-string-replace'
  ],
-  function (
+  (
    React,
    Router,
    MailPoet,
    Form,
    ReactStringReplace
-  ) {
+  ) => {
    var fields = [
      {
        name: 'email',
@ -68,7 +68,7 @@ define(
            return null;
          }

-          return subscriber.subscriptions.map(function (subscription) {
+          return subscriber.subscriptions.map((subscription) => {
            if (subscription.status === 'subscribed') {
              return subscription.segment_id;
            }
@ -84,7 +84,7 @@ define(
          let label = '';

          if (subscriber.subscriptions !== undefined) {
-            subscriber.subscriptions.map(function (subscription) {
+            subscriber.subscriptions.map((subscription) => {
              if (segment.id === subscription.segment_id) {
                label = segment.name;

--- a/assets/js/src/subscribers/list.jsx
+++ b/assets/js/src/subscribers/list.jsx
@ -245,7 +245,7 @@ const item_actions = [
 const SubscriberList = React.createClass({
  getSegmentFromId: function (segment_id) {
    let result = false;
-    mailpoet_segments.map(function (segment) {
+    mailpoet_segments.map((segment) => {
      if (segment.id === segment_id) {
        result = segment;
      }