diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json index afcb9cf002..e76de97873 100644 --- a/.eslintrc.es6.json +++ b/.eslintrc.es6.json @@ -48,7 +48,6 @@ "camelcase": 0, "eqeqeq": 0, "space-unary-ops": 0, - "dot-notation": 0, "no-shadow": 0, "no-alert": 0, "no-script-url": 0, diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx index dbf3cda096..6b11f3bd4d 100644 --- a/assets/js/src/form/fields/field.jsx +++ b/assets/js/src/form/fields/field.jsx @@ -32,7 +32,7 @@ define([ let field = false; let dataField = data.field; - if (data.field['field'] !== undefined) { + if (data.field.field !== undefined) { dataField = jQuery.merge(dataField, data.field.field); } @@ -89,7 +89,7 @@ define([ render: function () { let field = false; - if (this.props.field['fields'] !== undefined) { + if (this.props.field.fields !== undefined) { field = this.props.field.fields.map((subfield, index) => { return this.renderField({ index: index, diff --git a/assets/js/src/form/fields/select.jsx b/assets/js/src/form/fields/select.jsx index 1482acb5f0..79d8f7b688 100644 --- a/assets/js/src/form/fields/select.jsx +++ b/assets/js/src/form/fields/select.jsx @@ -17,7 +17,7 @@ const FormFieldSelect = React.createClass({ ); } - if (this.props.field['filter'] !== undefined) { + if (this.props.field.filter !== undefined) { filter = this.props.field.filter; } diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index 6ff4e814c9..d2835f6bcc 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -84,8 +84,8 @@ define([ this.setState({ select2: true }); }, getSelectedValues: function () { - if (this.props.field['selected'] !== undefined) { - return this.props.field['selected'](this.props.item); + if (this.props.field.selected !== undefined) { + return this.props.field.selected(this.props.item); } else if (this.props.item !== undefined && this.props.field.name !== undefined) { if (this.allowMultipleValues()) { if (Array.isArray(this.props.item[this.props.field.name])) { @@ -104,7 +104,7 @@ define([ let items = window['mailpoet_' + this.props.field.endpoint]; - if (this.props.field['filter'] !== undefined) { + if (this.props.field.filter !== undefined) { items = items.filter(this.props.field.filter); } @@ -131,19 +131,19 @@ define([ } }, getLabel: function (item) { - if (this.props.field['getLabel'] !== undefined) { + if (this.props.field.getLabel !== undefined) { return this.props.field.getLabel(item, this.props.item); } return item.name; }, getSearchLabel: function (item) { - if (this.props.field['getSearchLabel'] !== undefined) { + if (this.props.field.getSearchLabel !== undefined) { return this.props.field.getSearchLabel(item, this.props.item); } return null; }, getValue: function (item) { - if (this.props.field['getValue'] !== undefined) { + if (this.props.field.getValue !== undefined) { return this.props.field.getValue(item, this.props.item); } return item.id; @@ -152,7 +152,7 @@ define([ // this function may be used to transform the placeholder value into // desired value. transformChangedValue: function (value) { - if (typeof this.props.field['transformChangedValue'] === 'function') { + if (typeof this.props.field.transformChangedValue === 'function') { return this.props.field.transformChangedValue.call(this, value); } return value; diff --git a/assets/js/src/form/fields/text.jsx b/assets/js/src/form/fields/text.jsx index d65230cbc5..75402a88b4 100644 --- a/assets/js/src/form/fields/text.jsx +++ b/assets/js/src/form/fields/text.jsx @@ -11,7 +11,7 @@ const FormFieldText = React.createClass({ { - if (field['fields'] !== undefined) { + if (field.fields !== undefined) { field.fields.map((subfield) => { item[subfield.name] = this.state.item[subfield.name]; }); diff --git a/assets/js/src/listing/bulk_actions.jsx b/assets/js/src/listing/bulk_actions.jsx index 27031b1e4e..d63843a647 100644 --- a/assets/js/src/listing/bulk_actions.jsx +++ b/assets/js/src/listing/bulk_actions.jsx @@ -21,7 +21,7 @@ define([ const action = this.getSelectedAction(); // action on select callback - if (action !== null && action['onSelect'] !== undefined) { + if (action !== null && action.onSelect !== undefined) { this.setState({ extra: action.onSelect(e), }); @@ -41,14 +41,14 @@ define([ ? this.props.selected_ids : []; - const data = (action['getData'] !== undefined) + const data = (action.getData !== undefined) ? action.getData() : {}; data.action = this.state.action; let onSuccess = function () {}; - if (action['onSuccess'] !== undefined) { + if (action.onSuccess !== undefined) { onSuccess = action.onSuccess; } diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx index 83149ddd80..2516757055 100644 --- a/assets/js/src/listing/listing.jsx +++ b/assets/js/src/listing/listing.jsx @@ -513,7 +513,7 @@ const Listing = React.createClass({ }).done((response) => { if ( this.props.messages !== undefined - && this.props.messages['onRestore'] !== undefined + && this.props.messages.onRestore !== undefined ) { this.props.messages.onRestore(response); } @@ -541,7 +541,7 @@ const Listing = React.createClass({ }).done((response) => { if ( this.props.messages !== undefined - && this.props.messages['onTrash'] !== undefined + && this.props.messages.onTrash !== undefined ) { this.props.messages.onTrash(response); } @@ -569,7 +569,7 @@ const Listing = React.createClass({ }).done((response) => { if ( this.props.messages !== undefined - && this.props.messages['onDelete'] !== undefined + && this.props.messages.onDelete !== undefined ) { this.props.messages.onDelete(response); } diff --git a/assets/js/src/newsletters/breadcrumb.jsx b/assets/js/src/newsletters/breadcrumb.jsx index f6b4d3472f..8ee176d908 100644 --- a/assets/js/src/newsletters/breadcrumb.jsx +++ b/assets/js/src/newsletters/breadcrumb.jsx @@ -46,7 +46,7 @@ define( let label = step.label; - if (step['link'] !== undefined && this.props.step !== step.name) { + if (step.link !== undefined && this.props.step !== step.name) { label = ( { step.label } ); diff --git a/assets/js/src/newsletters/listings/notification_history.jsx b/assets/js/src/newsletters/listings/notification_history.jsx index 76ecf36cd3..e80795328c 100644 --- a/assets/js/src/newsletters/listings/notification_history.jsx +++ b/assets/js/src/newsletters/listings/notification_history.jsx @@ -13,7 +13,7 @@ import { MailerMixin, } from 'newsletters/listings/mixins.jsx'; -const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled'])); +const mailpoet_tracking_enabled = (!!(window.mailpoet_tracking_enabled)); const columns = [ { diff --git a/assets/js/src/newsletters/listings/standard.jsx b/assets/js/src/newsletters/listings/standard.jsx index f07365a6c5..412ce243f6 100644 --- a/assets/js/src/newsletters/listings/standard.jsx +++ b/assets/js/src/newsletters/listings/standard.jsx @@ -13,7 +13,7 @@ import { MailerMixin, } from 'newsletters/listings/mixins.jsx'; -const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled'])); +const mailpoet_tracking_enabled = (!!(window.mailpoet_tracking_enabled)); const messages = { onTrash: (response) => { diff --git a/assets/js/src/newsletters/listings/welcome.jsx b/assets/js/src/newsletters/listings/welcome.jsx index 63ce6c9740..9d9a6629bb 100644 --- a/assets/js/src/newsletters/listings/welcome.jsx +++ b/assets/js/src/newsletters/listings/welcome.jsx @@ -13,7 +13,7 @@ import Hooks from 'wp-js-hooks'; const mailpoet_roles = window.mailpoet_roles || {}; const mailpoet_segments = window.mailpoet_segments || {}; -const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled'])); +const mailpoet_tracking_enabled = (!!(window.mailpoet_tracking_enabled)); const messages = { onTrash: (response) => { diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 6be233e009..958d6e74c4 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -331,7 +331,7 @@ define( {MailPoet.I18n.t('goBackToDesign')} .

- { !isPaused && sendButtonOptions['disabled'] && sendButtonOptions['disabled'] === 'disabled' && ( + { !isPaused && sendButtonOptions.disabled && sendButtonOptions.disabled === 'disabled' && (