diff --git a/.eslintrc.es5.json b/.eslintrc.es5.json index c736e862fe..9141f503e5 100644 --- a/.eslintrc.es5.json +++ b/.eslintrc.es5.json @@ -86,7 +86,6 @@ "dot-notation": 0, "linebreak-style": 0, "indent": 0, - "quote-props": 0, "prefer-template": 0, "func-names": 0 } diff --git a/assets/js/src/form_editor/form_editor.js b/assets/js/src/form_editor/form_editor.js index 58fb388642..98fec58922 100644 --- a/assets/js/src/form_editor/form_editor.js +++ b/assets/js/src/form_editor/form_editor.js @@ -319,10 +319,10 @@ var WysijaForm = { save: function() { var position = 1, data = { - 'name': $F('mailpoet_form_name'), - 'settings': $('mailpoet_form_settings').serialize(true), - 'body': [], - 'styles': (MailPoet.CodeEditor !== undefined) ? MailPoet.CodeEditor.getValue() : null + name: $F('mailpoet_form_name'), + settings: $('mailpoet_form_settings').serialize(true), + body: [], + styles: (MailPoet.CodeEditor !== undefined) ? MailPoet.CodeEditor.getValue() : null }; // body WysijaForm.getBlocks().each(function(b) { diff --git a/assets/js/src/jquery.serialize_object.js b/assets/js/src/jquery.serialize_object.js index a2e7ad50e2..ca65ec9faf 100644 --- a/assets/js/src/jquery.serialize_object.js +++ b/assets/js/src/jquery.serialize_object.js @@ -25,7 +25,7 @@ define( */ $.fn.serializeObject = function(coerce) { var obj = {}, - coerce_types = { 'true': !0, 'false': !1, 'null': null }; + coerce_types = { true: !0, false: !1, null: null }; // Iterate over all name=value pairs. $.each( this.serializeArray(), function(j, v){ diff --git a/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js b/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js index 1a18c827bf..05cdf1ffc5 100644 --- a/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js +++ b/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js @@ -11,8 +11,8 @@ define([ BL.HighlightEditingBehavior = Marionette.Behavior.extend({ modelEvents: { - 'startEditing': 'enableHighlight', - 'stopEditing': 'disableHighlight' + startEditing: 'enableHighlight', + stopEditing: 'disableHighlight' }, enableHighlight: function() { this.$el.addClass('mailpoet_highlight'); diff --git a/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js b/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js index 9bf478992d..467989fb98 100644 --- a/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js +++ b/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js @@ -19,8 +19,8 @@ define([ modelField: 'styles.block.height' }, events: { - 'mouseenter': 'showResizeHandle', - 'mouseleave': 'hideResizeHandle' + mouseenter: 'showResizeHandle', + mouseleave: 'hideResizeHandle' }, onRender: function() { this.attachResize(); diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js index d57dbae869..a5e1181846 100644 --- a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js +++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js @@ -131,7 +131,7 @@ define([ className: 'mailpoet_block mailpoet_automated_latest_content_block mailpoet_droppable_block', initialize: function() { function replaceButtonStylesHandler(data) { - this.model.set({'readMoreButton': data}); + this.model.set({readMoreButton: data}); } App.getChannel().on('replaceAllButtonStyles', replaceButtonStylesHandler.bind(this)); }, @@ -143,7 +143,7 @@ define([ modelEvents: _.extend( _.omit(base.BlockView.prototype.modelEvents, 'change'), { - 'postsChanged': 'render' + postsChanged: 'render' }), events: _.extend(base.BlockView.prototype.events, { 'click .mailpoet_automated_latest_content_block_overlay': 'showSettings' diff --git a/assets/js/src/newsletter_editor/blocks/base.js b/assets/js/src/newsletter_editor/blocks/base.js index aca60706fa..484cf11445 100644 --- a/assets/js/src/newsletter_editor/blocks/base.js +++ b/assets/js/src/newsletter_editor/blocks/base.js @@ -50,13 +50,13 @@ define([ toolsRegion: '> .mailpoet_tools' }, modelEvents: { - 'change': 'render', - 'delete': 'deleteBlock', - 'duplicate': 'duplicateBlock' + change: 'render', + delete: 'deleteBlock', + duplicate: 'duplicateBlock' }, events: { - 'mouseenter': 'showTools', - 'mouseleave': 'hideTools' + mouseenter: 'showTools', + mouseleave: 'hideTools' }, behaviors: { DraggableBehavior: { diff --git a/assets/js/src/newsletter_editor/blocks/image.js b/assets/js/src/newsletter_editor/blocks/image.js index 712800acc5..12c76b2d34 100644 --- a/assets/js/src/newsletter_editor/blocks/image.js +++ b/assets/js/src/newsletter_editor/blocks/image.js @@ -177,7 +177,7 @@ define([ var handlers = { content: { - 'embed': 'embedContent', + embed: 'embedContent', 'edit-selection': 'editSelectionContent' }, toolbar: { diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 92c1a32757..3050adb207 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -296,7 +296,7 @@ define([ this.blockModel = options.blockModel; }, events: { - 'scroll': 'onPostsScroll' + scroll: 'onPostsScroll' }, onPostsScroll: function(event) { var $postsBox = jQuery(event.target); @@ -326,10 +326,10 @@ define([ this.$('.mailpoet_post_scroll_container').scrollTop(0); } }, - 'loadingMorePosts': function() { + loadingMorePosts: function() { this.$('.mailpoet_post_selection_loading').css('visibility', 'visible'); }, - 'morePostsLoaded': function() { + morePostsLoaded: function() { this.$('.mailpoet_post_selection_loading').css('visibility', 'hidden'); } }, diff --git a/assets/js/src/newsletter_editor/blocks/social.js b/assets/js/src/newsletter_editor/blocks/social.js index 35be008944..7533d61f18 100644 --- a/assets/js/src/newsletter_editor/blocks/social.js +++ b/assets/js/src/newsletter_editor/blocks/social.js @@ -87,7 +87,7 @@ define([ tagName: 'span', getTemplate: function() { return templates.socialIconBlock; }, modelEvents: { - 'change': 'render' + change: 'render' }, templateContext: function() { var allIconSets = App.getAvailableStyles().get('socialIconSets'); @@ -214,7 +214,7 @@ define([ SocialBlockSettingsIconSelectorView = Marionette.View.extend({ getTemplate: function() { return templates.socialSettingsIconSelector; }, regions: { - 'icons': '#mailpoet_social_icon_selector_contents' + icons: '#mailpoet_social_icon_selector_contents' }, events: { 'click .mailpoet_add_social_icon': 'addSocialIcon' @@ -237,7 +237,7 @@ define([ SocialBlockSettingsStylesView = Marionette.View.extend({ getTemplate: function() { return templates.socialSettingsStyles; }, modelEvents: { - 'change': 'render' + change: 'render' }, events: { 'click .mailpoet_social_icon_set': 'changeSocialIconSet' diff --git a/assets/js/src/newsletter_editor/components/styles.js b/assets/js/src/newsletter_editor/components/styles.js index 2e5736785f..7efa5adf7f 100644 --- a/assets/js/src/newsletter_editor/components/styles.js +++ b/assets/js/src/newsletter_editor/components/styles.js @@ -49,7 +49,7 @@ define([ Module.StylesView = Marionette.View.extend({ getTemplate: function() { return templates.styles; }, modelEvents: { - 'change': 'render' + change: 'render' }, serializeData: function() { return this.model.toJSON(); diff --git a/assets/js/src/settings/reinstall_from_scratch.js b/assets/js/src/settings/reinstall_from_scratch.js index ab296beb96..34b602dc5e 100644 --- a/assets/js/src/settings/reinstall_from_scratch.js +++ b/assets/js/src/settings/reinstall_from_scratch.js @@ -15,9 +15,9 @@ define( MailPoet.Modal.loading(true); MailPoet.Ajax.post({ - 'api_version': window.mailpoet_api_version, - 'endpoint': 'setup', - 'action': 'reset' + api_version: window.mailpoet_api_version, + endpoint: 'setup', + action: 'reset' }).always(function () { MailPoet.Modal.loading(false); }).done(function () { diff --git a/assets/js/src/subscribers/importExport/export.js b/assets/js/src/subscribers/importExport/export.js index ae85fd187f..88def65bb0 100644 --- a/assets/js/src/subscribers/importExport/export.js +++ b/assets/js/src/subscribers/importExport/export.js @@ -142,11 +142,11 @@ define( endpoint: 'ImportExport', action: 'processExport', data: JSON.stringify({ - 'export_confirmed_option': exportData.exportConfirmedOption, - 'export_format_option': jQuery(':radio[name="option_format"]:checked').val(), - 'group_by_segment_option': (groupBySegmentOptionElement.is(':visible')) ? groupBySegmentOptionElement.prop('checked') : false, - 'segments': (exportData.segments) ? segmentsContainerElement.val() : false, - 'subscriber_fields': subscriberFieldsContainerElement.val() + export_confirmed_option: exportData.exportConfirmedOption, + export_format_option: jQuery(':radio[name="option_format"]:checked').val(), + group_by_segment_option: (groupBySegmentOptionElement.is(':visible')) ? groupBySegmentOptionElement.prop('checked') : false, + segments: (exportData.segments) ? segmentsContainerElement.val() : false, + subscriber_fields: subscriberFieldsContainerElement.val() }) }).always(function(response) { MailPoet.Modal.loading(false); diff --git a/assets/js/src/subscribers/importExport/import.js b/assets/js/src/subscribers/importExport/import.js index f862d204c4..71f155b446 100644 --- a/assets/js/src/subscribers/importExport/import.js +++ b/assets/js/src/subscribers/importExport/import.js @@ -30,9 +30,9 @@ define( router = new (Backbone.Router.extend({ routes: { '': 'home', - 'step1': 'step1', - 'step2': 'step2', - 'step3': 'step3' + step1: 'step1', + step2: 'step2', + step3: 'step3' }, home: function () { this.navigate('step1', {trigger: true}); @@ -407,13 +407,13 @@ define( // since we assume that the header line is always present, we need // to detect the header by checking if it contains a valid e-mail address importData.step1 = { - 'header': (!emailRegex.test( + header: (!emailRegex.test( processedSubscribers[0][emailColumnPosition]) ) ? processedSubscribers.shift() : null, - 'subscribers': processedSubscribers, - 'subscribersCount': processedSubscribers.length, - 'duplicate': duplicateEmails, - 'invalid': invalidEmails + subscribers: processedSubscribers, + subscribersCount: processedSubscribers.length, + duplicate: duplicateEmails, + invalid: invalidEmails }; router.navigate('step2', {trigger: true}); } @@ -592,9 +592,9 @@ define( } }).done(function(response) { mailpoetSegments.push({ - 'id': response.data.id, - 'name': response.data.name, - 'subscriberCount': 0 + id: response.data.id, + name: response.data.name, + subscriberCount: 0 }); var selected_values = segmentSelectElement.val(); @@ -670,7 +670,7 @@ define( && displayedColumnsIds.indexOf(columnId) === -1) ? columnId : 'ignore'; - displayedColumns[i] = {'column_id': columnId}; + displayedColumns[i] = {column_id: columnId}; displayedColumnsIds.push(columnId); } return options.fn(displayedColumns); @@ -747,17 +747,17 @@ define( data: data }).done(function(response) { var new_column_data = { - 'id': response.data.id, - 'name': response.data.name, - 'type': response.data.type, - 'params': response.data.params, - 'custom': true + id: response.data.id, + name: response.data.name, + type: response.data.type, + params: response.data.params, + custom: true }; // if this is the first custom column, create an "optgroup" if (mailpoetColumnsSelect2.length === 2) { mailpoetColumnsSelect2.push({ - 'name': MailPoet.I18n.t('userColumns'), - 'children': [] + name: MailPoet.I18n.t('userColumns'), + children: [] }); } mailpoetColumnsSelect2[2].children.push(new_column_data); @@ -974,10 +974,10 @@ define( timestamp = Date.now() / 1000, subscribers = [], importResults = { - 'created': 0, - 'updated': 0, - 'errors': [], - 'segments': [] + created: 0, + updated: 0, + errors: [], + segments: [] }, splitSubscribers = function (subscribers, size) { return subscribers.reduce(function (res, item, index) {