diff --git a/.eslintrc b/.eslintrc index e1374e915b..22e7d07d94 100644 --- a/.eslintrc +++ b/.eslintrc @@ -92,7 +92,7 @@ "import/newline-after-import": "off", "no-underscore-dangle": "off", "prefer-spread": "off", - "no-multiple-empty-lines": "off", + // "no-multiple-empty-lines": "off", "spaced-comment": "off", "prefer-rest-params": "off", "space-in-parens": "off", diff --git a/public/src/admin/advanced/events.js b/public/src/admin/advanced/events.js index 9da3f0fcec..c1ad423ed8 100644 --- a/public/src/admin/advanced/events.js +++ b/public/src/admin/advanced/events.js @@ -1,8 +1,6 @@ "use strict"; - - define('admin/advanced/events', function () { var Events = {}; diff --git a/public/src/admin/manage/registration.js b/public/src/admin/manage/registration.js index d1c999ab99..f6918bd674 100644 --- a/public/src/admin/manage/registration.js +++ b/public/src/admin/manage/registration.js @@ -1,7 +1,6 @@ "use strict"; - define('admin/manage/registration', function () { var Registration = {}; diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index c4a8df97d6..5e3dddf19a 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -1,7 +1,6 @@ "use strict"; - define('admin/manage/users', ['translator'], function (translator) { var Users = {}; diff --git a/public/src/admin/modules/colorpicker.js b/public/src/admin/modules/colorpicker.js index 29329c4085..99b6fe9ba3 100644 --- a/public/src/admin/modules/colorpicker.js +++ b/public/src/admin/modules/colorpicker.js @@ -1,7 +1,6 @@ "use strict"; - define('admin/modules/colorpicker', function () { var colorpicker = {}; diff --git a/public/src/admin/modules/instance.js b/public/src/admin/modules/instance.js index ca115199c4..23c0a76124 100644 --- a/public/src/admin/modules/instance.js +++ b/public/src/admin/modules/instance.js @@ -1,7 +1,6 @@ "use strict"; - define('admin/modules/instance', function () { var instance = {}; diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js index 8dc8b4e489..73f026023c 100644 --- a/public/src/admin/modules/selectable.js +++ b/public/src/admin/modules/selectable.js @@ -1,7 +1,6 @@ "use strict"; - define('admin/modules/selectable', ['jqueryui'], function (jqueryui) { var selectable = {}; diff --git a/public/src/admin/settings/cookies.js b/public/src/admin/settings/cookies.js index 10e825d4ae..f00411082c 100644 --- a/public/src/admin/settings/cookies.js +++ b/public/src/admin/settings/cookies.js @@ -1,7 +1,6 @@ 'use strict'; - define('admin/settings/cookies', [ 'admin/modules/colorpicker', ], function (colorpicker) { diff --git a/public/src/client/account/best.js b/public/src/client/account/best.js index 3146935be9..562438297a 100644 --- a/public/src/client/account/best.js +++ b/public/src/client/account/best.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/best', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Best = {}; diff --git a/public/src/client/account/bookmarks.js b/public/src/client/account/bookmarks.js index 16b13216be..80357fe89b 100644 --- a/public/src/client/account/bookmarks.js +++ b/public/src/client/account/bookmarks.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/bookmarks', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Bookmarks = {}; diff --git a/public/src/client/account/downvoted.js b/public/src/client/account/downvoted.js index d27b460af0..b4f0cc181f 100644 --- a/public/src/client/account/downvoted.js +++ b/public/src/client/account/downvoted.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/downvoted', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Downvoted = {}; diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index 7c05e1ccab..ddba6b266d 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/edit', ['forum/account/header', 'translator', 'components', 'pictureCropper'], function (header, translator, components, pictureCropper) { var AccountEdit = {}; diff --git a/public/src/client/account/edit/email.js b/public/src/client/account/edit/email.js index 66362e850d..e1a068979a 100644 --- a/public/src/client/account/edit/email.js +++ b/public/src/client/account/edit/email.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/edit/email', ['forum/account/header'], function (header) { var AccountEditEmail = {}; diff --git a/public/src/client/account/edit/password.js b/public/src/client/account/edit/password.js index f983e230ea..e2210e724c 100644 --- a/public/src/client/account/edit/password.js +++ b/public/src/client/account/edit/password.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/edit/password', ['forum/account/header', 'translator'], function (header, translator) { var AccountEditPassword = {}; diff --git a/public/src/client/account/edit/username.js b/public/src/client/account/edit/username.js index bedc6c400e..33d8ea99cd 100644 --- a/public/src/client/account/edit/username.js +++ b/public/src/client/account/edit/username.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/edit/username', ['forum/account/header'], function (header) { var AccountEditUsername = {}; diff --git a/public/src/client/account/followers.js b/public/src/client/account/followers.js index a055b12194..bae7343262 100644 --- a/public/src/client/account/followers.js +++ b/public/src/client/account/followers.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/followers', ['forum/account/header'], function (header) { var Followers = {}; diff --git a/public/src/client/account/following.js b/public/src/client/account/following.js index e52e973204..5881ae1bec 100644 --- a/public/src/client/account/following.js +++ b/public/src/client/account/following.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/following', ['forum/account/header'], function (header) { var Following = {}; diff --git a/public/src/client/account/groups.js b/public/src/client/account/groups.js index aaa3f3d930..ba3fb3ce7c 100644 --- a/public/src/client/account/groups.js +++ b/public/src/client/account/groups.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/groups', ['forum/account/header'], function (header) { var AccountTopics = {}; diff --git a/public/src/client/account/info.js b/public/src/client/account/info.js index 82bafaadb5..38f3111b83 100644 --- a/public/src/client/account/info.js +++ b/public/src/client/account/info.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/info', ['forum/account/header', 'components'], function (header, components) { var Info = {}; diff --git a/public/src/client/account/posts.js b/public/src/client/account/posts.js index 5c5668a267..3430fa3c98 100644 --- a/public/src/client/account/posts.js +++ b/public/src/client/account/posts.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) { var AccountPosts = {}; var method; diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index 2f7775c682..1b38dc0bbd 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/profile', [ 'forum/account/header', 'forum/infinitescroll', diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index 967e80bfd4..8159f50458 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/settings', ['forum/account/header', 'components', 'sounds'], function (header, components, sounds) { var AccountSettings = {}; diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index b825810e85..83bd4ef557 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) { var AccountTopics = {}; var template; diff --git a/public/src/client/account/upvoted.js b/public/src/client/account/upvoted.js index 192961402f..74c1f6c753 100644 --- a/public/src/client/account/upvoted.js +++ b/public/src/client/account/upvoted.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/account/upvoted', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Upvoted = {}; diff --git a/public/src/client/categories.js b/public/src/client/categories.js index 5e4e01e2b7..57b77c3af3 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/categories', ['components', 'translator'], function (components, translator) { var categories = {}; diff --git a/public/src/client/category/tools.js b/public/src/client/category/tools.js index d85ddadaf8..77d662e5ad 100644 --- a/public/src/client/category/tools.js +++ b/public/src/client/category/tools.js @@ -2,8 +2,6 @@ 'use strict'; - - define('forum/category/tools', [ 'forum/topic/move', 'topicSelect', diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 45e08c85e7..e0df5804df 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/chats', [ 'components', 'translator', diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index ab325cc950..5aa0585981 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/chats/messages', ['components', 'sounds', 'translator'], function (components, sounds, translator) { var messages = {}; diff --git a/public/src/client/chats/recent.js b/public/src/client/chats/recent.js index 8ecb0e8448..e689f0faad 100644 --- a/public/src/client/chats/recent.js +++ b/public/src/client/chats/recent.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/chats/recent', function () { var recent = {}; diff --git a/public/src/client/chats/search.js b/public/src/client/chats/search.js index d886a7e6bb..e1a7905bc2 100644 --- a/public/src/client/chats/search.js +++ b/public/src/client/chats/search.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/chats/search', ['components'], function (components) { var search = {}; diff --git a/public/src/client/compose.js b/public/src/client/compose.js index 27cf0be90d..e5df728610 100644 --- a/public/src/client/compose.js +++ b/public/src/client/compose.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/compose', [], function () { var Compose = {}; diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index 1c9e55bbac..9387fa44a7 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/infinitescroll', function () { var scroll = {}; diff --git a/public/src/client/notifications.js b/public/src/client/notifications.js index 0ca79ae6c0..97760b0e0f 100644 --- a/public/src/client/notifications.js +++ b/public/src/client/notifications.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/notifications', ['components', 'notifications', 'forum/infinitescroll'], function (components, notifs, infinitescroll) { var Notifications = {}; diff --git a/public/src/client/popular.js b/public/src/client/popular.js index b8999de7cf..02a1348156 100644 --- a/public/src/client/popular.js +++ b/public/src/client/popular.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/popular', ['components'], function (components) { var Popular = {}; diff --git a/public/src/client/recent.js b/public/src/client/recent.js index b29b1bddef..2ad5677a3a 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/recent', ['forum/infinitescroll', 'components'], function (infinitescroll, components) { var Recent = {}; diff --git a/public/src/client/register.js b/public/src/client/register.js index 79287d088e..329762271e 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -1,8 +1,6 @@ 'use strict'; - - define('forum/register', ['translator'], function (translator) { var Register = {}; var validationError = false; diff --git a/public/src/client/search.js b/public/src/client/search.js index 7df69aa440..36daa34420 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/search', ['search', 'autocomplete'], function (searchModule, autocomplete) { var Search = {}; diff --git a/public/src/client/tag.js b/public/src/client/tag.js index 8667cbc303..08774a0e36 100644 --- a/public/src/client/tag.js +++ b/public/src/client/tag.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function (recent, infinitescroll) { var Tag = {}; diff --git a/public/src/client/tags.js b/public/src/client/tags.js index 7d683831e8..fb57d4d553 100644 --- a/public/src/client/tags.js +++ b/public/src/client/tags.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/tags', ['forum/infinitescroll'], function (infinitescroll) { var Tags = {}; var timeoutId = 0; diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 2c6c11ae2a..ec64795895 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -1,8 +1,6 @@ 'use strict'; - - define('forum/topic', [ 'forum/infinitescroll', 'forum/topic/threadTools', diff --git a/public/src/client/topic/delete-posts.js b/public/src/client/topic/delete-posts.js index d8f752706c..c770bf045a 100644 --- a/public/src/client/topic/delete-posts.js +++ b/public/src/client/topic/delete-posts.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/delete-posts', ['components', 'postSelect'], function (components, postSelect) { var DeletePosts = {}; diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index dba8b950aa..8f3010bd41 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -2,7 +2,6 @@ 'use strict'; - define('forum/topic/events', [ 'forum/topic/postTools', 'forum/topic/threadTools', diff --git a/public/src/client/topic/flag.js b/public/src/client/topic/flag.js index e44c77072c..cb46377641 100644 --- a/public/src/client/topic/flag.js +++ b/public/src/client/topic/flag.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/flag', [], function () { var Flag = {}; diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index ab8368ec52..8cc5035e2c 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/fork', ['components', 'postSelect'], function (components, postSelect) { var Fork = {}; diff --git a/public/src/client/topic/move-post.js b/public/src/client/topic/move-post.js index c4a66917e6..167ef5f413 100644 --- a/public/src/client/topic/move-post.js +++ b/public/src/client/topic/move-post.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/move-post', [], function () { var MovePost = {}; diff --git a/public/src/client/topic/move.js b/public/src/client/topic/move.js index 4043dc211d..85be9013dc 100644 --- a/public/src/client/topic/move.js +++ b/public/src/client/topic/move.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/move', function () { var Move = {}; diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index d7eedfd840..903c90f4df 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/postTools', [ 'share', 'navigator', diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index f2c20a5a8f..22d75dad80 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/posts', [ 'forum/pagination', 'forum/infinitescroll', diff --git a/public/src/client/topic/replies.js b/public/src/client/topic/replies.js index 03529225a5..be54d7027d 100644 --- a/public/src/client/topic/replies.js +++ b/public/src/client/topic/replies.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/replies', ['navigator', 'components', 'forum/topic/posts'], function (navigator, components, posts) { var Replies = {}; diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 9563e6d3ae..7c1529f12b 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/threadTools', [ 'forum/topic/fork', 'forum/topic/move', diff --git a/public/src/client/topic/votes.js b/public/src/client/topic/votes.js index f8f9785407..53b898ee67 100644 --- a/public/src/client/topic/votes.js +++ b/public/src/client/topic/votes.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/topic/votes', ['components', 'translator'], function (components, translator) { var Votes = {}; diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 41686a9eee..df35bfe4da 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', 'components'], function (recent, topicSelect, infinitescroll, components) { var Unread = {}; diff --git a/public/src/client/users.js b/public/src/client/users.js index 302f65c2c6..5c6f23bc7b 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -1,7 +1,6 @@ 'use strict'; - define('forum/users', ['translator'], function (translator) { var Users = {}; diff --git a/public/src/installer/install.js b/public/src/installer/install.js index c3bc1a06de..5f8e59b1eb 100644 --- a/public/src/installer/install.js +++ b/public/src/installer/install.js @@ -17,7 +17,6 @@ $('document').ready(function () { $('#launch').on('click', launchForum); - function setupInputs() { $('form').on('focus', '.form-control', function () { var parent = $(this).parents('.input-row'); diff --git a/public/src/modules/autocomplete.js b/public/src/modules/autocomplete.js index 5988797c13..3635932630 100644 --- a/public/src/modules/autocomplete.js +++ b/public/src/modules/autocomplete.js @@ -2,7 +2,6 @@ 'use strict'; - define('autocomplete', function () { var module = {}; diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js index 118515a5d5..9bbc28369d 100644 --- a/public/src/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -1,7 +1,6 @@ "use strict"; - define('iconSelect', function () { var iconSelect = {}; diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index f5c729f265..b6f7480027 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -2,8 +2,6 @@ 'use strict'; - - define('navigator', ['forum/pagination', 'components'], function (pagination, components) { var navigator = {}; diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 64b8e2f896..cfb53df136 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -1,7 +1,6 @@ 'use strict'; - define('notifications', ['sounds', 'translator', 'components'], function (sound, translator, components) { var Notifications = {}; diff --git a/public/src/modules/pictureCropper.js b/public/src/modules/pictureCropper.js index 3df948e979..7113c6bdd8 100644 --- a/public/src/modules/pictureCropper.js +++ b/public/src/modules/pictureCropper.js @@ -1,7 +1,6 @@ 'use strict'; - define('pictureCropper', ['translator', 'cropper'], function (translator, cropper) { var module = {}; diff --git a/public/src/modules/postSelect.js b/public/src/modules/postSelect.js index 528e488eaf..59cb6a3043 100644 --- a/public/src/modules/postSelect.js +++ b/public/src/modules/postSelect.js @@ -1,7 +1,6 @@ 'use strict'; - define('postSelect', ['components'], function (components) { var PostSelect = {}; @@ -54,6 +53,5 @@ define('postSelect', ['components'], function (components) { }; - return PostSelect; }); \ No newline at end of file diff --git a/public/src/modules/scrollStop.js b/public/src/modules/scrollStop.js index f083a01aa0..f8bd7e8868 100644 --- a/public/src/modules/scrollStop.js +++ b/public/src/modules/scrollStop.js @@ -1,7 +1,6 @@ 'use strict'; - /* The point of this library is to enhance(tm) a textarea so that if scrolled, you can only scroll to the top of it and the event doesn't bubble up to diff --git a/public/src/modules/share.js b/public/src/modules/share.js index b99068ea42..cdfd755bb0 100644 --- a/public/src/modules/share.js +++ b/public/src/modules/share.js @@ -1,7 +1,6 @@ 'use strict'; - define('share', function () { var module = {}; diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js index 097e443bf6..baa8576eb7 100644 --- a/public/src/modules/topicSelect.js +++ b/public/src/modules/topicSelect.js @@ -1,7 +1,6 @@ 'use strict'; - define('topicSelect', ['components'], function (components) { var TopicSelect = {}; var lastSelected; diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index ac1ba7e9f3..12d2f4c0fc 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -1,7 +1,6 @@ 'use strict'; - define('uploader', ['translator'], function (translator) { var module = {}; diff --git a/public/src/overrides.js b/public/src/overrides.js index 3cbe27ef28..78b6e3b1db 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -1,7 +1,6 @@ 'use strict'; - var overrides = overrides || {}; if ('undefined' !== typeof window) { diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index c77819f28e..33572aabbc 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -248,4 +248,3 @@ module.exports = function (Categories) { } }; - diff --git a/src/controllers/accounts/chats.js b/src/controllers/accounts/chats.js index 0e551c4fda..069734dbdc 100644 --- a/src/controllers/accounts/chats.js +++ b/src/controllers/accounts/chats.js @@ -114,5 +114,4 @@ chatsController.redirectToChat = function (req, res, next) { }; - module.exports = chatsController; \ No newline at end of file diff --git a/src/controllers/admin/database.js b/src/controllers/admin/database.js index 5ad87e6c5f..f5006af109 100644 --- a/src/controllers/admin/database.js +++ b/src/controllers/admin/database.js @@ -6,7 +6,6 @@ var nconf = require('nconf'); var databaseController = {}; - databaseController.get = function (req, res, next) { async.parallel({ redis: function (next) { diff --git a/src/controllers/admin/rewards.js b/src/controllers/admin/rewards.js index 8ff05c75b3..87f2cc16c7 100644 --- a/src/controllers/admin/rewards.js +++ b/src/controllers/admin/rewards.js @@ -13,5 +13,4 @@ rewardsController.get = function (req, res, next) { }; - module.exports = rewardsController; \ No newline at end of file diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index 6f98dabdf2..a70874b921 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -248,5 +248,4 @@ function deleteTempFiles(files) { } - module.exports = uploadsController; diff --git a/src/middleware/header.js b/src/middleware/header.js index 167b784672..0706374c1a 100644 --- a/src/middleware/header.js +++ b/src/middleware/header.js @@ -187,5 +187,3 @@ module.exports = function (middleware) { }; - - diff --git a/src/middleware/headers.js b/src/middleware/headers.js index 5e3a436013..899ce03c12 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -36,5 +36,3 @@ module.exports = function (middleware) { }; - - diff --git a/src/navigation/admin.js b/src/navigation/admin.js index 1261b2c822..50214179da 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -1,7 +1,6 @@ "use strict"; - var async = require('async'); var plugins = require('../plugins'); var db = require('../database'); diff --git a/src/posts/create.js b/src/posts/create.js index 429289ea78..fcd7bd1109 100644 --- a/src/posts/create.js +++ b/src/posts/create.js @@ -115,4 +115,3 @@ module.exports = function (Posts) { }; }; - diff --git a/src/routes/feeds.js b/src/routes/feeds.js index 2b8ed242c5..d75491e573 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -401,4 +401,3 @@ function sendFeed(feed, res) { res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml); } - diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 0493b093fd..80640a4578 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -244,4 +244,3 @@ Sockets.reqFromSocket = function (socket, payload, event) { }; }; - diff --git a/src/upgrade.js b/src/upgrade.js index a9670ef763..f71a5c93ea 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -1,7 +1,6 @@ "use strict"; - var db = require('./database'); var async = require('async'); var winston = require('winston'); diff --git a/src/webserver.js b/src/webserver.js index cf2d97b39f..a1f45cec04 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -284,4 +284,3 @@ module.exports.testSocket = function (socketPath, callback) { ], callback); }; - diff --git a/test/categories.js b/test/categories.js index 900d1a9aea..b1553df264 100644 --- a/test/categories.js +++ b/test/categories.js @@ -1,7 +1,6 @@ 'use strict'; - var async = require('async'); var assert = require('assert'); var nconf = require('nconf'); diff --git a/test/controllers.js b/test/controllers.js index 42496db702..1d9399ef24 100644 --- a/test/controllers.js +++ b/test/controllers.js @@ -46,7 +46,6 @@ describe('Controllers', function () { }); - it('should load default home route', function (done) { request(nconf.get('url'), function (err, res, body) { assert.ifError(err); diff --git a/test/database/hash.js b/test/database/hash.js index c8e67c9f1f..c560b37a44 100644 --- a/test/database/hash.js +++ b/test/database/hash.js @@ -391,7 +391,6 @@ describe('Hash methods', function () { }); - after(function (done) { db.emptydb(done); }); diff --git a/test/meta.js b/test/meta.js index b293f78ed9..cb231d9f39 100644 --- a/test/meta.js +++ b/test/meta.js @@ -183,7 +183,6 @@ describe('meta', function () { }); - after(function (done) { db.emptydb(done); }); diff --git a/test/notifications.js b/test/notifications.js index 041ac54fcf..e0a856b961 100644 --- a/test/notifications.js +++ b/test/notifications.js @@ -1,7 +1,6 @@ 'use strict'; - var assert = require('assert'); var async = require('async'); diff --git a/test/plugins.js b/test/plugins.js index b7267d8f4f..90fe7cabda 100644 --- a/test/plugins.js +++ b/test/plugins.js @@ -181,6 +181,5 @@ describe('Plugins', function () { }); - }); diff --git a/test/rewards.js b/test/rewards.js index ead6c6dd1a..7d61398d29 100644 --- a/test/rewards.js +++ b/test/rewards.js @@ -76,10 +76,6 @@ describe('rewards', function () { }); - - - - after(function (done) { db.emptydb(done); }); diff --git a/test/socket.io.js b/test/socket.io.js index 3965448142..3fcc7afa2c 100644 --- a/test/socket.io.js +++ b/test/socket.io.js @@ -3,7 +3,6 @@ // see https://gist.github.com/jfromaniello/4087861#gistcomment-1447029 - process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; var assert = require('assert'); @@ -254,7 +253,6 @@ describe('socket.io', function () { }); - describe('validation emails', function () { var socketAdmin = require('../src/socket.io/admin'); var meta = require('../src/meta'); diff --git a/test/uploads.js b/test/uploads.js index d1fd0e0df3..066a20434f 100644 --- a/test/uploads.js +++ b/test/uploads.js @@ -159,8 +159,6 @@ describe('Upload Controllers', function () { }); - - after(function (done) { db.emptydb(done); });