From ea552508b4e4f7924e606b355bf94e238f7ed8f4 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Wed, 29 Nov 2017 13:43:35 +0000 Subject: [PATCH] Fix consistent-return eslint rule in ES5 files [MAILPOET-1144] --- .eslintrc.es5.json | 1 - assets/js/src/form_editor/form_editor.js | 9 +++++---- assets/js/src/handlebars_helpers.js | 2 +- assets/js/src/modal.js | 1 + .../behaviors/ContainerDropZoneBehavior.js | 2 +- assets/js/src/newsletter_editor/blocks/base.js | 1 + assets/js/src/newsletter_editor/blocks/container.js | 2 ++ assets/js/src/newsletter_editor/blocks/posts.js | 1 + assets/js/src/newsletter_editor/blocks/social.js | 1 + assets/js/src/newsletter_editor/components/save.js | 1 + assets/js/src/newsletter_editor/components/sidebar.js | 1 + 11 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.eslintrc.es5.json b/.eslintrc.es5.json index b8f915fef8..fdad75a1ed 100644 --- a/.eslintrc.es5.json +++ b/.eslintrc.es5.json @@ -37,7 +37,6 @@ "global-require": 0, "no-throw-literal": 0, "no-extra-bind": 0, - "consistent-return": 0, "no-shadow": 0, "no-underscore-dangle": 0, "brace-style": 0, diff --git a/assets/js/src/form_editor/form_editor.js b/assets/js/src/form_editor/form_editor.js index 22e093b46a..3d46c4622b 100644 --- a/assets/js/src/form_editor/form_editor.js +++ b/assets/js/src/form_editor/form_editor.js @@ -330,6 +330,7 @@ WysijaForm = { setting.setValue(data.settings[setting.name]); } } + return true; }); } }, @@ -582,10 +583,8 @@ WysijaForm = { }, hideControls: function () { try { - return WysijaForm.getBlocks().invoke('hideControls'); - } catch (e) { - return; - } + WysijaForm.getBlocks().invoke('hideControls'); + } catch (e) {} }, hideTools: function () { window.$$('.wysija_tools').invoke('hide'); @@ -657,6 +656,7 @@ WysijaForm = { // this is a url, so do not encode the protocol return encodeURI(str).replace(/[!'()*]/g, escape); } + return str; }, updateBlock: function (field) { var hasUpdated = false; @@ -973,6 +973,7 @@ WysijaForm.Block.create = function (createBlock, target) { // position settings WysijaForm.setSettingsPosition(); + return true; }; document.observe('wjfe:item:drop', function (event) { diff --git a/assets/js/src/handlebars_helpers.js b/assets/js/src/handlebars_helpers.js index 22bcac22e3..e53b7170fc 100644 --- a/assets/js/src/handlebars_helpers.js +++ b/assets/js/src/handlebars_helpers.js @@ -17,7 +17,7 @@ define('handlebars_helpers', ['handlebars'], function (Handlebars) { var f; if (window.moment) { if (timestamp === undefined || isNaN(timestamp) || timestamp <= 0) { - return; + return undefined; } // set date format diff --git a/assets/js/src/modal.js b/assets/js/src/modal.js index 354022505f..f018f42929 100644 --- a/assets/js/src/modal.js +++ b/assets/js/src/modal.js @@ -215,6 +215,7 @@ define('modal', ['mailpoet', 'jquery'], jQuery(document).on('keyup.mailpoet_modal', function (e) { if (this.opened === false) { return false; } if (e.keyCode === 27) { this.cancel(); } + return true; }.bind(this)); // make sure the popup is repositioned when the window is resized diff --git a/assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js b/assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js index b8908b9dd4..31a12519e9 100644 --- a/assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js +++ b/assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js @@ -358,7 +358,7 @@ define([ if (orientation === 'horizontal' && insertionType === 'special') { // Disable special insertion for horizontal containers - return; + return undefined; } return { diff --git a/assets/js/src/newsletter_editor/blocks/base.js b/assets/js/src/newsletter_editor/blocks/base.js index 8fc239a18a..c1b59ad186 100644 --- a/assets/js/src/newsletter_editor/blocks/base.js +++ b/assets/js/src/newsletter_editor/blocks/base.js @@ -79,6 +79,7 @@ define([ WidgetView.destroy(); return node; } + return undefined; } }, HighlightEditingBehavior: {} diff --git a/assets/js/src/newsletter_editor/blocks/container.js b/assets/js/src/newsletter_editor/blocks/container.js index 51a9845ee2..e9db6c3b8c 100644 --- a/assets/js/src/newsletter_editor/blocks/container.js +++ b/assets/js/src/newsletter_editor/blocks/container.js @@ -54,6 +54,7 @@ define([ if (invalidBlock) { return invalidBlock.validationError; } + return undefined; }, parse: function (response) { // If container has any blocks - add them to a collection @@ -132,6 +133,7 @@ define([ WidgetView.destroy(); return node; } + return undefined; }, testAttachToInstance: function (model, view) { // Attach Draggable only to layout containers and disable it diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 61e265c3b3..e6bd98bc57 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -143,6 +143,7 @@ define([ }).always(function () { that.trigger('morePostsLoaded'); }); + return true; }, _refreshTransformedPosts: function () { var that = this; diff --git a/assets/js/src/newsletter_editor/blocks/social.js b/assets/js/src/newsletter_editor/blocks/social.js index 2dec5698b8..d14bd1cb0d 100644 --- a/assets/js/src/newsletter_editor/blocks/social.js +++ b/assets/js/src/newsletter_editor/blocks/social.js @@ -195,6 +195,7 @@ define([ } else { return this.changeField('link', event); } + return undefined; }, changeField: function (field, event) { this.model.set(field, jQuery(event.target).val()); diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js index 9ff7def363..52362e1a38 100644 --- a/assets/js/src/newsletter_editor/components/save.js +++ b/assets/js/src/newsletter_editor/components/save.js @@ -350,6 +350,7 @@ define([ return message; } + return undefined; }; App.on('before:start', function (App) { diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index d29504cdef..692b02d85f 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -339,6 +339,7 @@ define([ } }); }); + return undefined; } });