From 3d6bfa47c5483c87f2ba8dfdbc737136f92b0595 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Fri, 17 Feb 2017 22:13:41 -0700 Subject: [PATCH] ESlint no-useless-return --- .eslintrc | 2 +- public/src/admin/appearance/themes.js | 2 +- public/src/ajaxify.js | 2 +- src/controllers/index.js | 2 +- src/user/jobs.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.eslintrc b/.eslintrc index b5ab35f18b..9bdcaa181f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -112,6 +112,6 @@ "no-continue": "off", "no-extra-semi": "off", "no-spaced-func": "off", - "no-useless-return": "off" + // "no-useless-return": "off" } } diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js index d217520a13..ced02666be 100644 --- a/public/src/admin/appearance/themes.js +++ b/public/src/admin/appearance/themes.js @@ -72,7 +72,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { if (!themes.length) { instListEl.append($('
  • ').addClass('no-themes').translateHtml('[[admin/appearance/themes:no-themes]]')); - return; + } else { templates.parse('admin/partials/theme_list', { themes: themes, diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 22af54a266..7fb15ec72c 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -158,7 +158,7 @@ $(document).ready(function () { app.alertError('[[global:please_log_in]]'); app.previousUrl = url; window.location.href = config.relative_path + '/login'; - return; + } else if (status === 302 || status === 308) { if (data.responseJSON && data.responseJSON.external) { window.location.href = data.responseJSON.external; diff --git a/src/controllers/index.js b/src/controllers/index.js index 7ce1730dd6..e8b10ead0b 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -414,7 +414,7 @@ Controllers.handleURIErrors = function (err, req, res, next) { } } - return; + } else { next(err); } diff --git a/src/user/jobs.js b/src/user/jobs.js index c01f2c613c..a4a7f40ea6 100644 --- a/src/user/jobs.js +++ b/src/user/jobs.js @@ -63,7 +63,7 @@ module.exports = function (User) { callback(); } - return; + }; };