From f39cbe6b55814490c54c29a6e25b7941c3a21923 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Wed, 5 Jul 2017 09:31:46 +0100 Subject: [PATCH] Fix space-before-function-paren eslint rule [MAILPOET-985] --- .eslintrc.es6.json | 1 - assets/js/src/form/fields/checkbox.jsx | 6 +- assets/js/src/form/fields/date.jsx | 2 +- assets/js/src/form/fields/field.jsx | 8 +- assets/js/src/form/fields/radio.jsx | 4 +- assets/js/src/form/fields/selection.jsx | 44 ++++---- assets/js/src/form/fields/textarea.jsx | 4 +- assets/js/src/form/form.jsx | 32 +++--- assets/js/src/forms/list.jsx | 12 +- assets/js/src/listing/bulk_actions.jsx | 20 ++-- assets/js/src/listing/filters.jsx | 20 ++-- assets/js/src/listing/groups.jsx | 8 +- assets/js/src/listing/header.jsx | 10 +- assets/js/src/listing/listing.jsx | 104 +++++++++--------- assets/js/src/listing/pages.jsx | 26 ++--- assets/js/src/listing/search.jsx | 8 +- assets/js/src/newsletters/breadcrumb.jsx | 8 +- assets/js/src/newsletters/listings/mixins.jsx | 22 ++-- .../src/newsletters/listings/notification.jsx | 22 ++-- .../listings/notification_history.jsx | 10 +- .../js/src/newsletters/listings/standard.jsx | 14 +-- .../js/src/newsletters/listings/welcome.jsx | 16 +-- .../js/src/newsletters/scheduling/common.jsx | 8 +- assets/js/src/newsletters/send.jsx | 32 +++--- .../js/src/newsletters/send/notification.jsx | 16 +-- assets/js/src/newsletters/send/standard.jsx | 66 +++++------ assets/js/src/newsletters/send/welcome.jsx | 6 +- assets/js/src/newsletters/templates.jsx | 32 +++--- assets/js/src/newsletters/types.jsx | 18 +-- .../types/notification/notification.jsx | 14 +-- .../types/notification/scheduling.jsx | 16 +-- assets/js/src/newsletters/types/standard.jsx | 10 +- .../newsletters/types/welcome/scheduling.jsx | 24 ++-- assets/js/src/segments/form.jsx | 8 +- assets/js/src/segments/list.jsx | 26 ++--- assets/js/src/subscribers/form.jsx | 32 +++--- assets/js/src/subscribers/list.jsx | 40 +++---- 37 files changed, 374 insertions(+), 375 deletions(-) diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json index 5043a3227e..87973200d5 100644 --- a/.eslintrc.es6.json +++ b/.eslintrc.es6.json @@ -42,7 +42,6 @@ "comma-dangle": 0, "prefer-arrow-callback": 0, "func-names": 0, - "space-before-function-paren": 0, "object-shorthand": 0, "no-bitwise": 0, "arrow-body-style": 0, diff --git a/assets/js/src/form/fields/checkbox.jsx b/assets/js/src/form/fields/checkbox.jsx index 10d6fad58c..0861c03bcf 100644 --- a/assets/js/src/form/fields/checkbox.jsx +++ b/assets/js/src/form/fields/checkbox.jsx @@ -1,15 +1,15 @@ define([ 'react' ], -function( +function ( React ) { const FormFieldCheckbox = React.createClass({ - onValueChange: function(e) { + onValueChange: function (e) { e.target.value = this.refs.checkbox.checked ? '1' : '0'; return this.props.onValueChange(e); }, - render: function() { + render: function () { if (this.props.field.values === undefined) { return false; } diff --git a/assets/js/src/form/fields/date.jsx b/assets/js/src/form/fields/date.jsx index 0d4211a55c..06dd643008 100644 --- a/assets/js/src/form/fields/date.jsx +++ b/assets/js/src/form/fields/date.jsx @@ -1,7 +1,7 @@ define([ 'react', 'moment', -], function( +], function ( React, Moment ) { diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx index e1134607b3..09a3f01e0f 100644 --- 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( +function ( React, FormFieldText, FormFieldTextarea, @@ -19,7 +19,7 @@ function( FormFieldDate ) { var FormField = React.createClass({ - renderField: function(data, inline = false) { + renderField: function (data, inline = false) { var description = false; if(data.field.description) { description = ( @@ -83,11 +83,11 @@ function( ); } }, - render: function() { + render: 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(function (subfield, index) { return this.renderField({ index: index, field: subfield, diff --git a/assets/js/src/form/fields/radio.jsx b/assets/js/src/form/fields/radio.jsx index f1d2dfb745..863ce9df95 100644 --- a/assets/js/src/form/fields/radio.jsx +++ b/assets/js/src/form/fields/radio.jsx @@ -1,11 +1,11 @@ define([ 'react' ], -function( +function ( React ) { const FormFieldRadio = React.createClass({ - render: function() { + render: function () { if (this.props.field.values === undefined) { return false; } diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index f543871174..e31ce81cfd 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -4,33 +4,33 @@ define([ 'jquery', 'select2' ], -function( +function ( React, ReactDOM, jQuery ) { var Selection = React.createClass({ - getInitialState: function() { + getInitialState: function () { return { items: [], select2: false }; }, - componentWillMount: function() { + componentWillMount: function () { this.loadCachedItems(); }, - allowMultipleValues: function() { + allowMultipleValues: function () { return (this.props.field.multiple === true); }, - isSelect2Initialized: function() { + isSelect2Initialized: function () { return (this.state.select2 === true); }, - componentDidMount: function() { + componentDidMount: function () { if(this.allowMultipleValues()) { this.setupSelect2(); } }, - componentDidUpdate: function(prevProps, prevState) { + componentDidUpdate: function (prevProps, prevState) { if( (this.props.item !== undefined && prevProps.item !== undefined) && (this.props.item.id !== prevProps.item.id) @@ -40,24 +40,24 @@ function( .trigger('change'); } }, - componentWillUnmount: function() { + componentWillUnmount: function () { if(this.allowMultipleValues()) { this.destroySelect2(); } }, - destroySelect2: function() { + destroySelect2: function () { if(this.isSelect2Initialized()) { jQuery('#'+this.refs.select.id).select2('destroy'); } }, - setupSelect2: function() { + setupSelect2: function () { if(this.isSelect2Initialized()) { return; } var select2 = jQuery('#'+this.refs.select.id).select2({ width: (this.props.width || ''), - templateResult: function(item) { + templateResult: function (item) { if(item.element && item.element.selected) { return null; } else { @@ -71,10 +71,10 @@ function( }); var hasRemoved = false; - select2.on('select2:unselecting', function(e) { + select2.on('select2:unselecting', function (e) { hasRemoved = true; }); - select2.on('select2:opening', function(e) { + select2.on('select2:opening', function (e) { if(hasRemoved === true) { hasRemoved = false; e.preventDefault(); @@ -85,13 +85,13 @@ function( this.setState({ select2: true }); }, - getSelectedValues: function() { + getSelectedValues: function () { 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])) { - return this.props.item[this.props.field.name].map(function(item) { + return this.props.item[this.props.field.name].map(function (item) { return item.id; }); } @@ -101,7 +101,7 @@ function( } return null; }, - loadCachedItems: function() { + loadCachedItems: function () { if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') { var items = window['mailpoet_'+this.props.field.endpoint]; @@ -115,7 +115,7 @@ function( }); } }, - handleChange: function(e) { + handleChange: function (e) { if(this.props.onValueChange !== undefined) { if(this.props.field.multiple) { value = jQuery('#'+this.refs.select.id).val(); @@ -131,19 +131,19 @@ function( }); } }, - getLabel: function(item) { + getLabel: function (item) { if(this.props.field['getLabel'] !== undefined) { return this.props.field.getLabel(item, this.props.item); } return item.name; }, - getSearchLabel: function(item) { + getSearchLabel: function (item) { if(this.props.field['getSearchLabel'] !== undefined) { return this.props.field.getSearchLabel(item, this.props.item); } return null; }, - getValue: function(item) { + getValue: function (item) { if(this.props.field['getValue'] !== undefined) { return this.props.field.getValue(item, this.props.item); } @@ -152,14 +152,14 @@ function( // When it's impossible to represent the desired value in DOM, // this function may be used to transform the placeholder value into // desired value. - transformChangedValue: function(value) { + transformChangedValue: function (value) { if(typeof this.props.field['transformChangedValue'] === 'function') { return this.props.field.transformChangedValue.call(this, value); } else { return value; } }, - render: function() { + render: function () { const options = this.state.items.map((item, index) => { let label = this.getLabel(item); let searchLabel = this.getSearchLabel(item); diff --git a/assets/js/src/form/fields/textarea.jsx b/assets/js/src/form/fields/textarea.jsx index e8bf1ddaeb..146c4d0741 100644 --- a/assets/js/src/form/fields/textarea.jsx +++ b/assets/js/src/form/fields/textarea.jsx @@ -1,11 +1,11 @@ define([ 'react' ], -function( +function ( React ) { var FormFieldTextarea = React.createClass({ - render: function() { + render: function () { return (