From bc1d70c1263e39317c146f426bb7ca9db6d352d6 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Fri, 17 Feb 2017 19:31:21 -0700 Subject: [PATCH] ESlint comma-dangle --- .eslintignore | 3 - .eslintrc.json | 5 +- Gruntfile.js | 32 ++++---- app.js | 12 +-- bcrypt.js | 2 +- install/databases.js | 8 +- install/web.js | 16 ++-- loader.js | 12 +-- minifier.js | 10 +-- public/src/admin/admin.js | 14 ++-- public/src/admin/advanced/errors.js | 38 +++++----- public/src/admin/appearance/skins.js | 10 +-- public/src/admin/appearance/themes.js | 10 +-- public/src/admin/extend/plugins.js | 14 ++-- public/src/admin/extend/rewards.js | 2 +- public/src/admin/extend/widgets.js | 18 ++--- public/src/admin/general/dashboard.js | 64 ++++++++-------- public/src/admin/general/navigation.js | 4 +- public/src/admin/general/sounds.js | 2 +- public/src/admin/manage/categories.js | 18 ++--- public/src/admin/manage/category-analytics.js | 74 +++++++++---------- public/src/admin/manage/category.js | 42 +++++------ public/src/admin/manage/flags.js | 24 +++--- public/src/admin/manage/group.js | 16 ++-- public/src/admin/manage/groups.js | 10 +-- public/src/admin/manage/ip-blacklist.js | 2 +- public/src/admin/manage/tags.js | 12 +-- public/src/admin/manage/users.js | 18 ++--- public/src/admin/modules/colorpicker.js | 2 +- public/src/admin/modules/instance.js | 10 +-- public/src/admin/modules/search.js | 4 +- public/src/admin/modules/selectable.js | 2 +- public/src/admin/settings.js | 6 +- public/src/admin/settings/cookies.js | 2 +- public/src/ajaxify.js | 16 ++-- public/src/app.js | 46 ++++++------ public/src/client/account/edit.js | 18 ++--- public/src/client/account/edit/email.js | 2 +- public/src/client/account/edit/password.js | 2 +- public/src/client/account/edit/username.js | 2 +- public/src/client/account/header.js | 20 ++--- public/src/client/account/info.js | 4 +- public/src/client/account/posts.js | 2 +- public/src/client/account/profile.js | 4 +- public/src/client/account/settings.js | 2 +- public/src/client/account/topics.js | 2 +- public/src/client/categories.js | 2 +- public/src/client/category.js | 8 +- public/src/client/category/tools.js | 4 +- public/src/client/chats.js | 12 +-- public/src/client/chats/messages.js | 12 +-- public/src/client/chats/recent.js | 2 +- public/src/client/chats/search.js | 2 +- public/src/client/compose.js | 2 +- public/src/client/groups/details.js | 26 +++---- public/src/client/groups/list.js | 12 +-- public/src/client/groups/memberlist.js | 6 +- public/src/client/login.js | 4 +- public/src/client/notifications.js | 2 +- public/src/client/recent.js | 2 +- public/src/client/register.js | 8 +- public/src/client/reset_code.js | 2 +- public/src/client/search.js | 4 +- public/src/client/tag.js | 2 +- public/src/client/tags.js | 4 +- public/src/client/topic.js | 8 +- public/src/client/topic/delete-posts.js | 2 +- public/src/client/topic/events.js | 6 +- public/src/client/topic/flag.js | 2 +- public/src/client/topic/fork.js | 4 +- public/src/client/topic/move.js | 2 +- public/src/client/topic/postTools.js | 26 +++---- public/src/client/topic/posts.js | 6 +- public/src/client/topic/replies.js | 2 +- public/src/client/topic/threadTools.js | 6 +- public/src/client/topic/votes.js | 4 +- public/src/client/unread.js | 2 +- public/src/client/users.js | 2 +- public/src/installer/install.js | 2 +- public/src/modules/autocomplete.js | 18 ++--- public/src/modules/chat.js | 12 +-- public/src/modules/components.js | 2 +- public/src/modules/coverPhoto.js | 8 +- public/src/modules/helpers.js | 4 +- public/src/modules/iconSelect.js | 8 +- public/src/modules/navigator.js | 6 +- public/src/modules/notifications.js | 4 +- public/src/modules/pictureCropper.js | 8 +- public/src/modules/search.js | 12 +-- public/src/modules/settings.js | 24 +++--- public/src/modules/settings/array.js | 6 +- public/src/modules/settings/checkbox.js | 4 +- public/src/modules/settings/key.js | 4 +- public/src/modules/settings/number.js | 2 +- public/src/modules/settings/object.js | 2 +- public/src/modules/settings/select.js | 2 +- public/src/modules/settings/textarea.js | 2 +- public/src/modules/taskbar.js | 4 +- public/src/modules/translator.js | 2 +- public/src/modules/uploader.js | 8 +- public/src/require-config.js | 4 +- public/src/sockets.js | 4 +- public/src/utils.js | 8 +- public/src/widgets.js | 4 +- src/analytics.js | 2 +- src/batch.js | 4 +- src/categories.js | 16 ++-- src/categories/activeusers.js | 2 +- src/categories/create.js | 12 +-- src/categories/data.js | 2 +- src/categories/delete.js | 14 ++-- src/categories/recentreplies.js | 18 ++--- src/categories/topics.js | 8 +- src/categories/update.js | 16 ++-- src/controllers/accounts.js | 2 +- src/controllers/accounts/chats.js | 12 +-- src/controllers/accounts/edit.js | 8 +- src/controllers/accounts/follow.js | 2 +- src/controllers/accounts/groups.js | 2 +- src/controllers/accounts/helpers.js | 4 +- src/controllers/accounts/info.js | 4 +- src/controllers/accounts/notifications.js | 2 +- src/controllers/accounts/posts.js | 22 +++--- src/controllers/accounts/profile.js | 20 ++--- src/controllers/accounts/session.js | 2 +- src/controllers/accounts/settings.js | 26 +++---- src/controllers/admin.js | 4 +- src/controllers/admin/blacklist.js | 2 +- src/controllers/admin/cache.js | 6 +- src/controllers/admin/categories.js | 6 +- src/controllers/admin/dashboard.js | 16 ++-- src/controllers/admin/database.js | 2 +- src/controllers/admin/errors.js | 4 +- src/controllers/admin/events.js | 4 +- src/controllers/admin/flags.js | 6 +- src/controllers/admin/groups.js | 6 +- src/controllers/admin/homepage.js | 14 ++-- src/controllers/admin/info.js | 10 +-- src/controllers/admin/languages.js | 2 +- src/controllers/admin/logs.js | 2 +- src/controllers/admin/plugins.js | 4 +- src/controllers/admin/settings.js | 6 +- src/controllers/admin/social.js | 2 +- src/controllers/admin/sounds.js | 4 +- src/controllers/admin/uploads.js | 4 +- src/controllers/admin/users.js | 16 ++-- src/controllers/api.js | 20 ++--- src/controllers/authentication.js | 18 ++--- src/controllers/categories.js | 16 ++-- src/controllers/category.js | 30 ++++---- src/controllers/groups.js | 22 +++--- src/controllers/helpers.js | 18 ++--- src/controllers/index.js | 40 +++++----- src/controllers/mods.js | 2 +- src/controllers/popular.js | 6 +- src/controllers/recent.js | 10 +-- src/controllers/search.js | 6 +- src/controllers/tags.js | 16 ++-- src/controllers/topics.js | 44 +++++------ src/controllers/unread.js | 10 +-- src/controllers/uploads.js | 12 +-- src/controllers/users.js | 14 ++-- src/database/mongo.js | 26 +++---- src/database/mongo/hash.js | 6 +- src/database/mongo/sets.js | 16 ++-- src/database/mongo/sorted.js | 4 +- src/database/mongo/sorted/intersect.js | 8 +- src/database/mongo/sorted/union.js | 4 +- src/database/redis.js | 12 +-- src/emailer.js | 18 ++--- src/events.js | 10 +-- src/file.js | 4 +- src/groups.js | 26 +++---- src/groups/cover.js | 10 +-- src/groups/create.js | 6 +- src/groups/delete.js | 2 +- src/groups/membership.js | 50 ++++++------- src/groups/ownership.js | 4 +- src/groups/search.js | 6 +- src/groups/update.js | 22 +++--- src/image.js | 6 +- src/install.js | 46 ++++++------ src/logger.js | 2 +- src/messaging.js | 24 +++--- src/messaging/create.js | 10 +-- src/messaging/data.js | 4 +- src/messaging/delete.js | 2 +- src/messaging/edit.js | 8 +- src/messaging/notifications.js | 10 +-- src/messaging/rooms.js | 22 +++--- src/messaging/unread.js | 2 +- src/meta.js | 4 +- src/meta/blacklist.js | 8 +- src/meta/build.js | 6 +- src/meta/configs.js | 10 +-- src/meta/css.js | 8 +- src/meta/dependencies.js | 2 +- src/meta/js.js | 12 +-- src/meta/logs.js | 4 +- src/meta/settings.js | 6 +- src/meta/sounds.js | 8 +- src/meta/tags.js | 40 +++++----- src/meta/templates.js | 6 +- src/meta/themes.js | 8 +- src/middleware/admin.js | 8 +- src/middleware/header.js | 12 +-- src/middleware/headers.js | 2 +- src/middleware/index.js | 12 +-- src/middleware/maintenance.js | 2 +- src/middleware/render.js | 4 +- src/middleware/user.js | 4 +- src/navigation/admin.js | 4 +- src/notifications.js | 18 ++--- src/pagination.js | 6 +- src/plugins.js | 12 +-- src/plugins/hooks.js | 4 +- src/plugins/install.js | 6 +- src/plugins/load.js | 4 +- src/posts.js | 12 +-- src/posts/bookmarks.js | 8 +- src/posts/cache.js | 2 +- src/posts/category.js | 4 +- src/posts/create.js | 8 +- src/posts/delete.js | 26 +++---- src/posts/edit.js | 14 ++-- src/posts/flags.js | 34 ++++----- src/posts/recent.js | 6 +- src/posts/summary.js | 4 +- src/posts/tools.js | 4 +- src/posts/topics.js | 10 +-- src/posts/user.js | 6 +- src/posts/votes.js | 14 ++-- src/privileges.js | 4 +- src/privileges/categories.js | 28 +++---- src/privileges/helpers.js | 6 +- src/privileges/posts.js | 24 +++--- src/privileges/topics.js | 26 +++---- src/privileges/users.js | 8 +- src/reset.js | 6 +- src/rewards/admin.js | 12 +-- src/rewards/index.js | 2 +- src/routes/authentication.js | 6 +- src/routes/debug.js | 2 +- src/routes/feeds.js | 40 +++++----- src/routes/index.js | 4 +- src/search.js | 22 +++--- src/settings.js | 2 +- src/sitemap.js | 28 +++---- src/social.js | 12 +-- src/socket.io/admin.js | 16 ++-- src/socket.io/admin/categories.js | 2 +- src/socket.io/admin/groups.js | 6 +- src/socket.io/admin/rooms.js | 12 +-- src/socket.io/admin/user.js | 16 ++-- src/socket.io/categories.js | 16 ++-- src/socket.io/groups.js | 14 ++-- src/socket.io/helpers.js | 16 ++-- src/socket.io/index.js | 12 +-- src/socket.io/meta.js | 2 +- src/socket.io/modules.js | 28 +++---- src/socket.io/notifications.js | 2 +- src/socket.io/posts.js | 6 +- src/socket.io/posts/edit.js | 6 +- src/socket.io/posts/flag.js | 16 ++-- src/socket.io/posts/helpers.js | 6 +- src/socket.io/posts/move.js | 2 +- src/socket.io/posts/tools.js | 20 ++--- src/socket.io/posts/votes.js | 8 +- src/socket.io/topics/infinitescroll.js | 6 +- src/socket.io/topics/move.js | 4 +- src/socket.io/topics/tags.js | 4 +- src/socket.io/topics/tools.js | 10 +-- src/socket.io/topics/unread.js | 12 +-- src/socket.io/user.js | 28 +++---- src/socket.io/user/ban.js | 16 ++-- src/socket.io/user/picture.js | 16 ++-- src/socket.io/user/profile.js | 16 ++-- src/socket.io/user/search.js | 2 +- src/socket.io/user/status.js | 6 +- src/start.js | 8 +- src/topics.js | 20 ++--- src/topics/bookmarks.js | 4 +- src/topics/create.js | 22 +++--- src/topics/delete.js | 24 +++--- src/topics/follow.js | 18 ++--- src/topics/fork.js | 14 ++-- src/topics/popular.js | 4 +- src/topics/posts.js | 24 +++--- src/topics/recent.js | 16 ++-- src/topics/suggested.js | 8 +- src/topics/tags.js | 40 +++++----- src/topics/teaser.js | 4 +- src/topics/thumb.js | 4 +- src/topics/tools.js | 36 ++++----- src/topics/unread.js | 28 +++---- src/upgrade.js | 10 +-- src/user.js | 26 +++---- src/user/admin.js | 2 +- src/user/approval.js | 24 +++--- src/user/auth.js | 16 ++-- src/user/bans.js | 8 +- src/user/categories.js | 6 +- src/user/create.js | 14 ++-- src/user/delete.js | 26 +++---- src/user/digest.js | 14 ++-- src/user/email.js | 8 +- src/user/follow.js | 10 +-- src/user/info.js | 8 +- src/user/invite.js | 16 ++-- src/user/notifications.js | 16 ++-- src/user/password.js | 2 +- src/user/picture.js | 28 +++---- src/user/posts.js | 4 +- src/user/profile.js | 24 +++--- src/user/reset.js | 20 ++--- src/user/search.js | 4 +- src/user/settings.js | 6 +- src/user/topics.js | 2 +- src/webserver.js | 14 ++-- src/widgets/admin.js | 10 +-- src/widgets/index.js | 10 +-- test/authentication.js | 24 +++--- test/categories.js | 46 ++++++------ test/controllers-admin.js | 4 +- test/controllers.js | 38 +++++----- test/database/hash.js | 8 +- test/database/keys.js | 4 +- test/database/list.js | 8 +- test/database/sets.js | 2 +- test/database/sorted.js | 20 ++--- test/groups.js | 34 ++++----- test/helpers/index.js | 22 +++--- test/messaging.js | 6 +- test/meta.js | 4 +- test/mocks/databasemock.js | 10 +-- test/notifications.js | 12 +-- test/posts.js | 52 ++++++------- test/rewards.js | 8 +- test/search-admin.js | 12 +-- test/search.js | 26 +++---- test/socket.io.js | 12 +-- test/topics.js | 50 ++++++------- test/translator.js | 10 +-- test/uploads.js | 4 +- test/user.js | 40 +++++----- 345 files changed, 1974 insertions(+), 1978 deletions(-) diff --git a/.eslintignore b/.eslintignore index 250640f954..1692d5add2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,4 @@ node_modules/ -public/src/nodebb.min.js *.sublime-project *.sublime-workspace .project @@ -10,8 +9,6 @@ logs/ /public/uploads /public/sounds /public/vendor -/public/nodebb.min.js -/public/acp.min.js /public/src/modules/string.js .idea/ .vscode/ diff --git a/.eslintrc.json b/.eslintrc.json index f64256f73d..28d82dc1ac 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,7 @@ "rules": { "handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ], - "linebreak-style": "off", + // "linebreak-style": "off", "import/no-unresolved": "off", "import/no-extraneous-dependencies": "off", "one-var": "off", @@ -72,7 +72,7 @@ "no-param-reassign": "off", "consistent-return": "off", "strict": "off", - "comma-dangle": "off", + // "comma-dangle": "off", "no-multi-spaces": "off", "quotes": "off", "keyword-spacing": "off", @@ -100,7 +100,6 @@ "dot-notation": "off", "func-call-spacing": "off", "newline-per-chained-call": "off", - "newline-per-chained-call": "off", "array-bracket-spacing": "off", "object-property-newline": "off", "no-continue": "off", diff --git a/Gruntfile.js b/Gruntfile.js index 85ea76938f..bc1cf50a95 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -70,17 +70,17 @@ module.exports = function (grunt) { 'public/*.less', 'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/**/*.less', '!node_modules/nodebb-*/node_modules/**', - '!node_modules/nodebb-*/.git/**' + '!node_modules/nodebb-*/.git/**', ], options: { - interval: 1000 - } + interval: 1000, + }, }, lessUpdated_Admin: { files: ['public/**/*.less'], options: { - interval: 1000 - } + interval: 1000, + }, }, clientUpdated: { files: [ @@ -88,28 +88,28 @@ module.exports = function (grunt) { 'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/**/*.js', '!node_modules/nodebb-*/node_modules/**', 'node_modules/templates.js/lib/templates.js', - '!node_modules/nodebb-*/.git/**' + '!node_modules/nodebb-*/.git/**', ], options: { - interval: 1000 - } + interval: 1000, + }, }, serverUpdated: { files: ['*.js', 'install/*.js', 'src/**/*.js'], options: { - interval: 1000 - } + interval: 1000, + }, }, templatesUpdated: { files: [ 'src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/**/*.tpl', '!node_modules/nodebb-*/node_modules/**', - '!node_modules/nodebb-*/.git/**' + '!node_modules/nodebb-*/.git/**', ], options: { - interval: 1000 - } + interval: 1000, + }, }, langUpdated: { files: [ @@ -123,10 +123,10 @@ module.exports = function (grunt) { '!node_modules/nodebb-*/theme.json', ], options: { - interval: 1000 - } + interval: 1000, + }, }, - } + }, }); grunt.loadNpmTasks('grunt-contrib-watch'); diff --git a/app.js b/app.js index 57c57d61b6..5c667bc14b 100644 --- a/app.js +++ b/app.js @@ -41,7 +41,7 @@ winston.add(winston.transports.Console, { }, level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose'), json: (!!nconf.get('json-logging')), - stringify: (!!nconf.get('json-logging')) + stringify: (!!nconf.get('json-logging')), }); @@ -75,7 +75,7 @@ if (nconf.get('setup') || nconf.get('install')) { } else if (nconf.get('reset')) { async.waterfall([ async.apply(require('./src/reset').reset), - async.apply(require('./src/meta/build').buildAll) + async.apply(require('./src/meta/build').buildAll), ], function (err) { process.exit(err ? 1 : 0); }); @@ -93,7 +93,7 @@ function loadConfig(callback) { winston.verbose('* using configuration stored in: %s', configFile); nconf.file({ - file: configFile + file: configFile, }); nconf.defaults({ @@ -101,7 +101,7 @@ function loadConfig(callback) { themes_path: path.join(__dirname, 'node_modules'), upload_path: 'public/uploads', views_dir: path.join(__dirname, 'build/public/templates'), - version: pkg.version + version: pkg.version, }); if (!nconf.get('isCluster')) { @@ -149,7 +149,7 @@ function setup() { async.series([ async.apply(install.setup), async.apply(loadConfig), - async.apply(build.buildAll) + async.apply(build.buildAll), ], function (err, data) { // Disregard build step data data = data[0]; @@ -194,7 +194,7 @@ function upgrade() { async.apply(db.init), async.apply(meta.configs.init), async.apply(upgrade.upgrade), - async.apply(build.buildAll) + async.apply(build.buildAll), ], function (err) { if (err) { winston.error(err.stack); diff --git a/bcrypt.js b/bcrypt.js index 4040aa2a8f..35e36b839f 100644 --- a/bcrypt.js +++ b/bcrypt.js @@ -20,7 +20,7 @@ function hashPassword(password, rounds) { }, function (salt, next) { bcrypt.hash(password, salt, next); - } + }, ], done); } diff --git a/install/databases.js b/install/databases.js index c314ad75ef..7ce33bc1aa 100644 --- a/install/databases.js +++ b/install/databases.js @@ -6,7 +6,7 @@ var winston = require('winston'); var questions = { redis: require('../src/database/redis').questions, - mongo: require('../src/database/mongo').questions + mongo: require('../src/database/mongo').questions, }; module.exports = function (config, callback) { @@ -18,7 +18,7 @@ module.exports = function (config, callback) { }, function (databaseConfig, next) { saveDatabaseConfig(config, databaseConfig, next); - } + }, ], callback); }; @@ -55,7 +55,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) { host: databaseConfig['redis:host'], port: databaseConfig['redis:port'], password: databaseConfig['redis:password'], - database: databaseConfig['redis:database'] + database: databaseConfig['redis:database'], }; if (config.redis.host.slice(0, 1) === '/') { @@ -67,7 +67,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) { port: databaseConfig['mongo:port'], username: databaseConfig['mongo:username'], password: databaseConfig['mongo:password'], - database: databaseConfig['mongo:database'] + database: databaseConfig['mongo:database'], }; } else { return callback(new Error('unknown database : ' + config.database)); diff --git a/install/web.js b/install/web.js index 1bac1577d0..448483d747 100644 --- a/install/web.js +++ b/install/web.js @@ -19,7 +19,7 @@ winston.add(winston.transports.File, { var date = new Date(); return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']'; }, - level: 'verbose' + level: 'verbose', }); var web = {}; @@ -27,7 +27,7 @@ var scripts = [ 'public/vendor/xregexp/xregexp.js', 'public/vendor/xregexp/unicode/unicode-base.js', 'public/src/utils.js', - 'public/src/installer/install.js' + 'public/src/installer/install.js', ]; web.install = function (port) { @@ -39,7 +39,7 @@ web.install = function (port) { app.set('view engine', 'tpl'); app.set('views', path.join(__dirname, '../src/views')); app.use(bodyParser.urlencoded({ - extended: true + extended: true, })); async.parallel([compileLess, compileJS], function () { @@ -66,7 +66,7 @@ function welcome(req, res) { var databases = dbs.map(function (el) { return { name: el, - questions: require('../src/database/' + el).questions + questions: require('../src/database/' + el).questions, }; }); @@ -78,7 +78,7 @@ function welcome(req, res) { error: res.locals.error ? true : false, success: res.locals.success ? true : false, values: req.body, - minimumPasswordLength: defaults.minimumPasswordLength + minimumPasswordLength: defaults.minimumPasswordLength, }); } @@ -90,7 +90,7 @@ function install(req, res) { } var child = require('child_process').fork('app', ['--setup'], { - env: process.env + env: process.env, }); child.on('close', function (data) { @@ -110,7 +110,7 @@ function launch(req, res) { var child = require('child_process').spawn('node', ['loader.js'], { detached: true, - stdio: ['ignore', 'ignore', 'ignore'] + stdio: ['ignore', 'ignore', 'ignore'], }); process.stdout.write('\nStarting NodeBB\n'); @@ -120,7 +120,7 @@ function launch(req, res) { async.parallel([ async.apply(fs.unlink(path.join(__dirname, '../public/installer.css'))), - async.apply(fs.unlink(path.join(__dirname, '../public/installer.min.js'))) + async.apply(fs.unlink(path.join(__dirname, '../public/installer.min.js'))), ], function (err) { if (err) { winston.warn('Unable to remove installer files'); diff --git a/loader.js b/loader.js index 592a15c490..a1effda6c8 100644 --- a/loader.js +++ b/loader.js @@ -12,7 +12,7 @@ var nconf = require('nconf'), pkg = require('./package.json'); nconf.argv().env().file({ - file: path.join(__dirname, '/config.json') + file: path.join(__dirname, '/config.json'), }); var pidFilePath = __dirname + '/pidfile', @@ -22,7 +22,7 @@ var pidFilePath = __dirname + '/pidfile', workers = [], Loader = { - timesStarted: 0 + timesStarted: 0, }; Loader.init = function (callback) { @@ -118,7 +118,7 @@ function forkWorker(index, isPrimary) { var worker = fork('app.js', args, { silent: silent, - env: process.env + env: process.env, }); worker.index = index; @@ -175,7 +175,7 @@ Loader.restart = function () { Loader.reload = function () { workers.forEach(function (worker) { worker.send({ - action: 'reload' + action: 'reload', }); }); }; @@ -222,7 +222,7 @@ fs.open(path.join(__dirname, 'config.json'), 'r', function (err) { require('daemon')({ stdout: process.stdout, - stderr: process.stderr + stderr: process.stderr, }); fs.writeFile(__dirname + '/pidfile', process.pid); @@ -231,7 +231,7 @@ fs.open(path.join(__dirname, 'config.json'), 'r', function (err) { async.series([ Loader.init, Loader.displayStartupMessages, - Loader.start + Loader.start, ], function (err) { if (err) { console.log('[loader] Error during startup: ' + err.message); diff --git a/minifier.js b/minifier.js index 25c0177175..dd367b58a7 100644 --- a/minifier.js +++ b/minifier.js @@ -6,7 +6,7 @@ var fs = require('fs'); var file = require('./src/file'); var Minifier = { - js: {} + js: {}, }; /* Javascript */ @@ -39,7 +39,7 @@ process.on('message', function (payload) { process.send({ type: 'end', // sourceMap: sourceMap, - minified: minified + minified: minified, }); }); break; @@ -52,14 +52,14 @@ function minifyScripts(scripts, callback) { try { var minified = uglifyjs.minify(scripts, { // outSourceMap: "nodebb.min.js.map", - compress: false + compress: false, }); callback(minified.code/*, minified.map*/); } catch(err) { process.send({ type: 'error', - message: err.message + message: err.message, }); } } @@ -69,7 +69,7 @@ function concatenateScripts(scripts, callback) { if (err) { process.send({ type: 'error', - message: err.message + message: err.message, }); return; } diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index c4d92d63bc..8940d07284 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -14,7 +14,7 @@ message: '[[login:logged-out-due-to-inactivity]]', callback: function () { window.location.reload(); - } + }, }); }, 3600000); } @@ -165,7 +165,7 @@ var bar = $.snackbar({ content: html, timeout: params.timeout || 3000, - htmlAllowed: true + htmlAllowed: true, }); if (params.clickfn) { @@ -182,7 +182,7 @@ 'panel': document.getElementById('panel'), 'menu': document.getElementById('menu'), 'padding': 256, - 'tolerance': 70 + 'tolerance': 70, }); if (env === 'md' || env === 'lg') { @@ -205,12 +205,12 @@ if (env === 'md' || env === 'lg') { slideout.disableTouch(); $('#header').css({ - 'position': 'relative' + 'position': 'relative', }); } else { slideout.enableTouch(); $('#header').css({ - 'position': 'fixed' + 'position': 'fixed', }); } }); @@ -218,7 +218,7 @@ function onOpeningMenu() { $('#header').css({ 'top': $('#panel').position().top * -1 + 'px', - 'position': 'absolute' + 'position': 'absolute', }); } @@ -227,7 +227,7 @@ slideout.on('close', function () { $('#header').css({ 'top': '0px', - 'position': 'fixed' + 'position': 'fixed', }); }); } diff --git a/public/src/admin/advanced/errors.js b/public/src/admin/advanced/errors.js index d4cfccb7bd..56c2612d05 100644 --- a/public/src/admin/advanced/errors.js +++ b/public/src/admin/advanced/errors.js @@ -48,9 +48,9 @@ define('admin/advanced/errors', ['Chart', 'translator'], function (Chart, transl pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(186,139,175,1)", - data: ajaxify.data.analytics['not-found'] - } - ] + data: ajaxify.data.analytics['not-found'], + }, + ], }, 'toobusy': { labels: dailyLabels, @@ -63,10 +63,10 @@ define('admin/advanced/errors', ['Chart', 'translator'], function (Chart, transl pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(151,187,205,1)", - data: ajaxify.data.analytics['toobusy'] - } - ] - } + data: ajaxify.data.analytics['toobusy'], + }, + ], + }, }; notFoundCanvas.width = $(notFoundCanvas).parent().width(); @@ -78,16 +78,16 @@ define('admin/advanced/errors', ['Chart', 'translator'], function (Chart, transl options: { responsive: true, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); new Chart(tooBusyCanvas.getContext('2d'), { @@ -96,16 +96,16 @@ define('admin/advanced/errors', ['Chart', 'translator'], function (Chart, transl options: { responsive: true, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); }; diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index 35ad5a2289..cbdcb51a82 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -8,7 +8,7 @@ define('admin/appearance/skins', ['translator'], function (translator) { // Populate skins from Bootswatch API $.ajax({ method: 'get', - url: 'https://bootswatch.com/api/3.json' + url: 'https://bootswatch.com/api/3.json', }).done(Skins.render); $('#skins').on('click', function (e) { @@ -30,7 +30,7 @@ define('admin/appearance/skins', ['translator'], function (translator) { socket.emit('admin.themes.set', { type: themeType, id: themeId, - src: cssSrc + src: cssSrc, }, function (err) { if (err) { return app.alertError(err.message); @@ -42,7 +42,7 @@ define('admin/appearance/skins', ['translator'], function (translator) { type: 'info', title: '[[admin/appearance/skins:skin-updated]]', message: themeId ? ('[[admin/appearance/skins:applied-success, ' + themeId + ']]') : '[[admin/appearance/skins:revert-success]]', - timeout: 5000 + timeout: 5000, }); }); } @@ -62,10 +62,10 @@ define('admin/appearance/skins', ['translator'], function (translator) { screenshot_url: theme.thumbnail, url: theme.preview, css: theme.cssCdn, - skin: true + skin: true, }; }), - showRevert: true + showRevert: true, }, function (html) { translator.translate(html, function (html) { themeContainer.html(html); diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js index 4158f6fef7..ecf90c6882 100644 --- a/public/src/admin/appearance/themes.js +++ b/public/src/admin/appearance/themes.js @@ -18,7 +18,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { socket.emit('admin.themes.set', { type: themeType, id: themeId, - src: cssSrc + src: cssSrc, }, function (err) { if (err) { return app.alertError(err.message); @@ -34,7 +34,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { timeout: 5000, clickfn: function () { socket.emit('admin.restart'); - } + }, }); }); } @@ -45,7 +45,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { if (confirm) { socket.emit('admin.themes.set', { type: 'local', - id: 'nodebb-theme-persona' + id: 'nodebb-theme-persona', }, function (err) { if (err) { return app.alertError(err.message); @@ -56,7 +56,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { type: 'success', title: '[[admin/appearance/themes:theme-changed]]', message: '[[admin/appearance/themes:revert-success]]', - timeout: 3500 + timeout: 3500, }); }); } @@ -75,7 +75,7 @@ define('admin/appearance/themes', ['translator'], function (translator) { return; } else { templates.parse('admin/partials/theme_list', { - themes: themes + themes: themes, }, function (html) { translator.translate(html, function (html) { instListEl.html(html); diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index d3774922c6..73d57d7b1a 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -44,7 +44,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t require(['admin/modules/instance'], function (instance) { instance.restart(); }); - } + }, }); }); }); @@ -170,7 +170,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t btn.attr('disabled', true).find('i').attr('class', 'fa fa-refresh fa-spin'); socket.emit('admin.plugins.upgrade', { id: pluginID, - version: version + version: version, }, function (err, isActive) { if (err) { return app.alertError(err.message); @@ -190,7 +190,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t require(['admin/modules/instance'], function (instance) { instance.reload(); }); - } + }, }); } }); @@ -203,7 +203,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t socket.emit('admin.plugins.toggleInstall', { id: pluginID, - version: version + version: version, }, function (err, pluginData) { if (err) { btn.removeAttr('disabled'); @@ -217,7 +217,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t title: '[[admin/extend/plugins:alert.' + (pluginData.installed ? 'installed' : 'uninstalled') + ']]', message: '[[admin/extend/plugins:alert.' + (pluginData.installed ? 'install-success' : 'uninstall-success') + ']]', type: 'info', - timeout: 5000 + timeout: 5000, }); if (typeof callback === 'function') { @@ -232,9 +232,9 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t type: 'GET', data: { package: pluginId, - version: nbbVersion[0] + version: nbbVersion[0], }, - dataType: 'json' + dataType: 'json', }).done(function (payload) { callback(undefined, payload); }).fail(callback); diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 8b347101f9..3854568eed 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -133,7 +133,7 @@ define('admin/extend/rewards', ['translator'], function (translator) { value: '', claimable: 1, rid: null, - id: null + id: null, }], conditions: conditions, conditionals: conditionals, diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 6db6b53490..67267df2a1 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -35,7 +35,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { return $(e.target).parents('.widget-panel').clone(); }, distance: 10, - connectToSortable: ".widget-area" + connectToSortable: ".widget-area", }); $('#widgets .available-containers .containers > [data-container-html]') @@ -46,7 +46,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { return target.clone().addClass('block').width(target.width()).css('opacity', '0.5'); }, - distance: 10 + distance: 10, }) .each(function () { $(this).attr('data-container-html', $(this).attr('data-container-html').replace(/\\\{([\s\S]*?)\\\}/g, '{$1}')); @@ -57,7 +57,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { createDatePicker(ui.item); appendToggle(ui.item); }, - connectWith: "div" + connectWith: "div", }).on('click', '.delete-widget', function () { var panel = $(this).parents('.widget-panel'); @@ -106,14 +106,14 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { widgets.push({ widget: $(this).attr('data-widget'), - data: widgetData + data: widgetData, }); }); socket.emit('admin.widgets.set', { template: template, location: location, - widgets: widgets + widgets: widgets, }, function (err) { total--; @@ -127,7 +127,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { type: 'success', title: '[[admin/extend/widgets:alert.updated]]', message: '[[admin/extend/widgets:alert.update-success]]', - timeout: 2500 + timeout: 2500, }); } @@ -150,7 +150,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { .addClass(btn.attr('data-class')); container.attr('data-container-html', container.attr('data-container-html') - .replace(/class="[a-zA-Z0-9-\s]+"/, 'class="' + container[0].className.replace(' pointer ui-draggable', '') + '"') + .replace(/class="[a-zA-Z0-9-\s]+"/, 'class="' + container[0].className.replace(' pointer ui-draggable', '') + '"'), ); }); } @@ -160,7 +160,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { el.find('.date-selector').datepicker({ changeMonth: true, changeYear: true, - yearRange: currentYear + ':' + (currentYear + 100) + yearRange: currentYear + ':' + (currentYear + 100), }); } @@ -175,7 +175,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) { el.find('.panel-body .container-html').val(ui.draggable.attr('data-container-html')); el.find('.panel-body').removeClass('hidden'); }, - hoverClass: "panel-info" + hoverClass: "panel-info", }) .children('.panel-heading') .append('
 
') diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js index f9e2589f65..3c4c4eb199 100644 --- a/public/src/admin/general/dashboard.js +++ b/public/src/admin/general/dashboard.js @@ -5,23 +5,23 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s var Admin = {}; var intervals = { rooms: false, - graphs: false + graphs: false, }; var isMobile = false; var isPrerelease = /^v?\d+\.\d+\.\d+-.+$/; var graphData = { rooms: {}, - traffic: {} + traffic: {}, }; var currentGraph = { units: 'hours', - until: undefined + until: undefined, }; var DEFAULTS = { roomInterval: 10000, graphInterval: 15000, - realtimeInterval: 1500 + realtimeInterval: 1500, }; $(window).on('action:ajaxify.start', function (ev, data) { @@ -123,7 +123,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s traffic: null, registered: null, presence: null, - topics: null + topics: null, }; var topicColors = ["#bf616a","#5B90BF","#d08770","#ebcb8b","#a3be8c","#96b5b4","#8fa1b3","#b48ead","#ab7967","#46BFBD"]; @@ -196,7 +196,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(220,220,220,1)", - data: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + data: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], }, { label: translations[1], @@ -206,9 +206,9 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(151,187,205,1)", - data: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - } - ] + data: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], + }, + ], }; trafficCanvas.width = $(trafficCanvas).parent().width(); @@ -218,16 +218,16 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s options: { responsive: true, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); graphs.registered = new Chart(registeredCtx, { @@ -237,15 +237,15 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s datasets: [{ data: [1, 1], backgroundColor: ["#F7464A", "#46BFBD"], - hoverBackgroundColor: ["#FF5A5E", "#5AD3D1"] - }] + hoverBackgroundColor: ["#FF5A5E", "#5AD3D1"], + }], }, options: { responsive: true, legend: { - display: false - } - } + display: false, + }, + }, }); graphs.presence = new Chart(presenceCtx, { @@ -255,15 +255,15 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s datasets: [{ data: [1, 1, 1, 1, 1], backgroundColor: ["#F7464A", "#46BFBD", "#FDB45C", "#949FB1", "#9FB194"], - hoverBackgroundColor: ["#FF5A5E", "#5AD3D1", "#FFC870", "#A8B3C5", "#A8B3C5"] - }] + hoverBackgroundColor: ["#FF5A5E", "#5AD3D1", "#FFC870", "#A8B3C5", "#A8B3C5"], + }], }, options: { responsive: true, legend: { - display: false - } - } + display: false, + }, + }, }); graphs.topics = new Chart(topicsCtx, { @@ -273,15 +273,15 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s datasets: [{ data: [], backgroundColor: [], - hoverBackgroundColor: [] - }] + hoverBackgroundColor: [], + }], }, options: { responsive: true, legend: { - display: false - } - } + display: false, + }, + }, }); updateTrafficGraph(); @@ -322,7 +322,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s socket.emit('admin.analytics.get', { graph: 'traffic', units: units || 'hours', - until: until + until: until, }, function (err, data) { if (err) { return app.alertError(err.message); @@ -376,7 +376,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s if (!Object.keys(topics).length) { topics = {"0": { title: "No users browsing", - value: 1 + value: 1, }}; } diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index 6fa59aff24..163c955e32 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -18,12 +18,12 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun connectToSortable: '#active-navigation', helper: 'clone', distance: 10, - stop: drop + stop: drop, }); }); $('#active-navigation').sortable().droppable({ - accept: $('#available li .drag-item') + accept: $('#available li .drag-item'), }); $('#enabled').on('click', '.iconPicker', function () { diff --git a/public/src/admin/general/sounds.js b/public/src/admin/general/sounds.js index 64926e60db..e258e0db55 100644 --- a/public/src/admin/general/sounds.js +++ b/public/src/admin/general/sounds.js @@ -21,7 +21,7 @@ define('admin/general/sounds', ['sounds', 'settings'], function (Sounds, Setting saveEl.on('click', function () { Settings.save('sounds', $('.sounds form'), function () { socket.emit('admin.fireEvent', { - name: 'event:sounds.reloadMapping' + name: 'event:sounds.reloadMapping', }); app.alertSuccess('[[admin/general/sounds:saved]]'); }); diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index acb55b82e9..2e78f3a97c 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -38,7 +38,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri } templates.parse('admin/partials/categories/create', { - categories: categories + categories: categories, }, function (html) { function submit() { var formData = modal.find('form').serializeObject(); @@ -57,9 +57,9 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri save: { label: '[[global:save]]', className: 'btn-primary', - callback: submit - } - } + callback: submit, + }, + }, }); modal.find('form').on('submit', submit); @@ -78,7 +78,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri title: '[[admin/manage/categories:alert.created]]', message: '[[admin/manage/categories:alert.create-success]]', type: 'success', - timeout: 2000 + timeout: 2000, }); ajaxify.go('admin/manage/categories/' + data.cid); @@ -106,7 +106,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri cids.forEach(function (cid) { payload[cid] = { - disabled: disabled ? 1 : 0 + disabled: disabled ? 1 : 0, }; }); @@ -132,7 +132,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri for(i; i < len; ++i) { modified[list[i]] = { - order: (i + 1) + order: (i + 1), }; } @@ -176,7 +176,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri function continueRender() { templates.parse('admin/partials/categories/category-rows', { cid: parentId, - categories: categories + categories: categories, }, function (html) { translator.translate(html, function (html) { container.append(html); @@ -194,7 +194,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri dataIdAttr: 'data-cid', ghostClass: "placeholder", onAdd: itemDidAdd, - onEnd: itemDragDidEnd + onEnd: itemDragDidEnd, }); }); }); diff --git a/public/src/admin/manage/category-analytics.js b/public/src/admin/manage/category-analytics.js index 4bd80c305e..95f8093d2f 100644 --- a/public/src/admin/manage/category-analytics.js +++ b/public/src/admin/manage/category-analytics.js @@ -32,9 +32,9 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(186,139,175,1)", - data: ajaxify.data.analytics['pageviews:hourly'] - } - ] + data: ajaxify.data.analytics['pageviews:hourly'], + }, + ], }, 'pageviews:daily': { labels: dailyLabels, @@ -47,9 +47,9 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(151,187,205,1)", - data: ajaxify.data.analytics['pageviews:daily'] - } - ] + data: ajaxify.data.analytics['pageviews:daily'], + }, + ], }, 'topics:daily': { labels: dailyLabels.slice(-7), @@ -62,9 +62,9 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(171,70,66,1)", - data: ajaxify.data.analytics['topics:daily'] - } - ] + data: ajaxify.data.analytics['topics:daily'], + }, + ], }, 'posts:daily': { labels: dailyLabels.slice(-7), @@ -77,10 +77,10 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(161,181,108,1)", - data: ajaxify.data.analytics['posts:daily'] - } - ] - } + data: ajaxify.data.analytics['posts:daily'], + }, + ], + }, }; hourlyCanvas.width = $(hourlyCanvas).parent().width(); @@ -95,16 +95,16 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { responsive: true, animation: false, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); new Chart(dailyCanvas.getContext('2d'), { @@ -114,16 +114,16 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { responsive: true, animation: false, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); new Chart(topicsCanvas.getContext('2d'), { @@ -133,16 +133,16 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { responsive: true, animation: false, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); new Chart(postsCanvas.getContext('2d'), { @@ -152,16 +152,16 @@ define('admin/manage/category-analytics', ['Chart'], function (Chart) { responsive: true, animation: false, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); }; diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js index cb0eb22a35..c4662eecce 100644 --- a/public/src/admin/manage/category.js +++ b/public/src/admin/manage/category.js @@ -6,7 +6,7 @@ define('admin/manage/category', [ 'iconSelect', 'admin/modules/colorpicker', 'autocomplete', - 'translator' + 'translator', ], function (uploader, iconSelect, colorpicker, autocomplete, translator) { var Category = {}; var modified_categories = {}; @@ -41,10 +41,10 @@ define('admin/manage/category', [ title: '[[admin/manage/categories:alert.updated]]', message: translator.compile( 'admin/manage/categories:alert.updated-success', - results.join(', ') + results.join(', '), ), type: 'success', - timeout: 2000 + timeout: 2000, }); } }); @@ -103,7 +103,7 @@ define('admin/manage/category', [ title: 'Updated Categories', message: 'Category IDs ' + result.join(', ') + ' was successfully updated.', type: 'success', - timeout: 2000 + timeout: 2000, }); } }); @@ -117,7 +117,7 @@ define('admin/manage/category', [ bootbox.confirm(translator.compile( 'admin/manage/categories:alert.confirm-purge', - $('form.category').find('input[data-name="name"]').val() + $('form.category').find('input[data-name="name"]').val(), ), function (confirm) { if (!confirm) { return; @@ -152,7 +152,7 @@ define('admin/manage/category', [ uploader.show({ title: '[[admin/manage/categories:alert.upload-image]]', route: config.relative_path + '/api/admin/category/uploadpicture', - params: {cid: cid} + params: {cid: cid}, }, function (imageUrlOnServer) { $('#category-image').val(imageUrlOnServer); var previewBox = inputEl.parent().parent().siblings('.category-preview'); @@ -186,7 +186,7 @@ define('admin/manage/category', [ $('button[data-action="removeParent"]').on('click', function () { var payload = {}; payload[ajaxify.data.category.cid] = { - parentCid: 0 + parentCid: 0, }; socket.emit('admin.categories.update', payload, function (err) { @@ -220,7 +220,7 @@ define('admin/manage/category', [ var tagEl = $('#tag-whitelist'); tagEl.tagsinput({ confirmKeys: [13, 44], - trimValue: true + trimValue: true, }); ajaxify.data.category.tagWhitelist.forEach(function (tag) { @@ -273,7 +273,7 @@ define('admin/manage/category', [ } templates.parse('admin/partials/categories/privileges', { - privileges: privileges + privileges: privileges, }, function (html) { translator.translate(html, function (html) { $('.privilege-table-container').html(html); @@ -310,7 +310,7 @@ define('admin/manage/category', [ cid: ajaxify.data.category.cid, privilege: privilege, set: state, - member: member + member: member, }, function (err) { if (err) { return app.alertError(err.message); @@ -332,11 +332,11 @@ define('admin/manage/category', [ }); templates.parse('partials/category_list', { - categories: categories + categories: categories, }, function (html) { var modal = bootbox.dialog({ message: html, - title: '[[admin/manage/categories:alert.set-parent-category]]' + title: '[[admin/manage/categories:alert.set-parent-category]]', }); modal.find('li[data-cid]').on('click', function () { @@ -344,7 +344,7 @@ define('admin/manage/category', [ payload = {}; payload[ajaxify.data.category.cid] = { - parentCid: parentCid + parentCid: parentCid, }; socket.emit('admin.categories.update', payload, function (err) { @@ -371,7 +371,7 @@ define('admin/manage/category', [ var modal = bootbox.dialog({ title: '[[admin/manage/categories:alert.find-user]]', message: '', - show: true + show: true, }); modal.on('shown.bs.modal', function () { @@ -382,7 +382,7 @@ define('admin/manage/category', [ cid: ajaxify.data.category.cid, privilege: ['find', 'read', 'topics:read'], set: true, - member: ui.item.user.uid + member: ui.item.user.uid, }, function (err) { if (err) { return app.alertError(err.message); @@ -399,7 +399,7 @@ define('admin/manage/category', [ var modal = bootbox.dialog({ title: '[[admin/manage/categories:alert.find-group]]', message: '', - show: true + show: true, }); modal.on('shown.bs.modal', function () { @@ -410,7 +410,7 @@ define('admin/manage/category', [ cid: ajaxify.data.category.cid, privilege: ['groups:find', 'groups:read', 'groups:topics:read'], set: true, - member: ui.item.group.name + member: ui.item.group.name, }, function (err) { if (err) { return app.alertError(err.message); @@ -450,7 +450,7 @@ define('admin/manage/category', [ } templates.parse('admin/partials/categories/select-category', { - categories: categories + categories: categories, }, function (html) { translator.translate(html, function (html) { function submit() { @@ -467,9 +467,9 @@ define('admin/manage/category', [ save: { label: 'Copy', className: 'btn-primary', - callback: submit - } - } + callback: submit, + }, + }, }); modal.find('form').on('submit', submit); diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js index 0bf47060dd..16f928c260 100644 --- a/public/src/admin/manage/flags.js +++ b/public/src/admin/manage/flags.js @@ -5,7 +5,7 @@ define('admin/manage/flags', [ 'autocomplete', 'Chart', 'components', - 'translator' + 'translator', ], function (autocomplete, Chart, components, translator) { var Flags = {}; @@ -105,10 +105,10 @@ define('admin/manage/flags', [ pointHoverBackgroundColor: "#fff", pointBorderColor: "#fff", pointHoverBorderColor: "rgba(151,187,205,1)", - data: ajaxify.data.analytics - } - ] - } + data: ajaxify.data.analytics, + }, + ], + }, }; dailyCanvas.width = $(dailyCanvas).parent().width(); @@ -119,16 +119,16 @@ define('admin/manage/flags', [ responsive: true, animation: false, legend: { - display: false + display: false, }, scales: { yAxes: [{ ticks: { - beginAtZero: true - } - }] - } - } + beginAtZero: true, + }, + }], + }, + }, }); } @@ -162,7 +162,7 @@ define('admin/manage/flags', [ socket.emit('posts.updateFlag', { pid: pid, - data: formData + data: formData, }, function (err) { if (err) { return app.alertError(err.message); diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js index a64ca9dd63..150b1d2315 100644 --- a/public/src/admin/manage/group.js +++ b/public/src/admin/manage/group.js @@ -5,7 +5,7 @@ define('admin/manage/group', [ 'forum/groups/memberlist', 'iconSelect', 'admin/modules/colorpicker', - 'translator' + 'translator', ], function (memberList, iconSelect, colorpicker, translator) { var Groups = {}; @@ -59,7 +59,7 @@ define('admin/manage/group', [ 'data-userslug': results.users[x].userslug, 'data-picture': results.users[x].picture, 'data-usericon-bgColor': results.users[x]['icon:bgColor'], - 'data-usericon-text': results.users[x]['icon:text'] + 'data-usericon-text': results.users[x]['icon:text'], }) .append(results.users[x].picture ? $('').addClass('avatar avatar-sm').attr('src', results.users[x].picture) : @@ -81,7 +81,7 @@ define('admin/manage/group', [ socket.emit('admin.groups.join', { groupName: groupName, - uid: uid + uid: uid, }, function (err) { if (err) { return app.alertError(err.message); @@ -93,7 +93,7 @@ define('admin/manage/group', [ userslug: userLabel.attr('data-userslug'), picture: userLabel.attr('data-picture'), "icon:bgColor": userLabel.attr('data-usericon-bgColor'), - "icon:text": userLabel.attr('data-usericon-text') + "icon:text": userLabel.attr('data-usericon-text'), }; templates.parse('partials/groups/memberlist', 'members', {group: {isOwner: ajaxify.data.group.isOwner, members: [member]}}, function (html) { @@ -116,7 +116,7 @@ define('admin/manage/group', [ case 'toggleOwnership': socket.emit('groups.' + (isOwner ? 'rescind' : 'grant'), { toUid: uid, - groupName: groupName + groupName: groupName, }, function (err) { if (err) { return app.alertError(err.message); @@ -132,7 +132,7 @@ define('admin/manage/group', [ } socket.emit('admin.groups.leave', { uid: uid, - groupName: groupName + groupName: groupName, }, function (err) { if (err) { return app.alertError(err.message); @@ -167,8 +167,8 @@ define('admin/manage/group', [ userTitleEnabled: $('#group-userTitleEnabled').is(':checked'), private: $('#group-private').is(':checked'), hidden: $('#group-hidden').is(':checked'), - disableJoinRequests: $('#group-disableJoinRequests').is(':checked') - } + disableJoinRequests: $('#group-disableJoinRequests').is(':checked'), + }, }, function (err) { if (err) { return app.alertError(err.message); diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 5c30e7f3cd..e63b78b8c7 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -30,7 +30,7 @@ define('admin/manage/groups', ['translator'], function (translator) { createModalGo.on('click', function () { var submitObj = { name: createGroupName.val(), - description: $('#create-group-desc').val() + description: $('#create-group-desc').val(), }, errorText; @@ -61,7 +61,7 @@ define('admin/manage/groups', ['translator'], function (translator) { bootbox.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) { if (confirm) { socket.emit('groups.delete', { - groupName: groupName + groupName: groupName, }, function (err, data) { if(err) { return app.alertError(err.message); @@ -86,15 +86,15 @@ define('admin/manage/groups', ['translator'], function (translator) { socket.emit('groups.search', { query: queryEl.val(), options: { - sort: 'date' - } + sort: 'date', + }, }, function (err, groups) { if (err) { return app.alertError(err.message); } templates.parse('admin/manage/groups', 'groups', { - groups: groups + groups: groups, }, function (html) { translator.translate(html, function (html) { groupsEl.find('[data-groupname]').remove(); diff --git a/public/src/admin/manage/ip-blacklist.js b/public/src/admin/manage/ip-blacklist.js index 321bc9fac1..637dd5ebe9 100644 --- a/public/src/admin/manage/ip-blacklist.js +++ b/public/src/admin/manage/ip-blacklist.js @@ -27,7 +27,7 @@ define('admin/manage/ip-blacklist', ['translator'], function (translator) { $('[data-action="test"]').on('click', function () { socket.emit('blacklist.validate', { - rules: blacklist.val() + rules: blacklist.val(), }, function (err, data) { if (err) { return app.alertError(err.message); diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js index 9984c8182d..1116feed7c 100644 --- a/public/src/admin/manage/tags.js +++ b/public/src/admin/manage/tags.js @@ -4,7 +4,7 @@ define('admin/manage/tags', [ 'forum/infinitescroll', 'admin/modules/selectable', - 'admin/modules/colorpicker' + 'admin/modules/colorpicker', ], function (infinitescroll, selectable, colorpicker) { var Tags = {}, timeoutId = 0; @@ -38,7 +38,7 @@ define('admin/manage/tags', [ createModalGo.on('click', function () { socket.emit('admin.tags.create', { - tag: createTagName.val() + tag: createTagName.val(), }, function (err) { if (err) { return app.alertError(err.message); @@ -109,9 +109,9 @@ define('admin/manage/tags', [ save(tag); }); - } - } - } + }, + }, + }, }); handleColorPickers(modal); @@ -156,7 +156,7 @@ define('admin/manage/tags', [ var data = { tag: tag.attr('data-tag'), bgColor : tag.find('[data-name="bgColor"]').val(), - color : tag.find('[data-name="color"]').val() + color : tag.find('[data-name="color"]').val(), }; socket.emit('admin.tags.update', data, function (err) { diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index 192dec7501..858baaff75 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -91,7 +91,7 @@ define('admin/manage/users', ['translator'], function (translator) { buttons: { close: { label: '[[global:close]]', - className: 'btn-link' + className: 'btn-link', }, submit: { label: '[[admin/manage/users:alerts.button-ban-x, ' + uids.length + ']]', @@ -102,9 +102,9 @@ define('admin/manage/users', ['translator'], function (translator) { }, {}); var until = formData.length ? (Date.now() + formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1)) : 0; socket.emit('user.banUsers', { uids: uids, until: until, reason: formData.reason }, done('[[admin/manage/users:alerts.ban-success]]', '.ban', true)); - } - } - } + }, + }, + }, }); }); }); @@ -266,7 +266,7 @@ define('admin/manage/users', ['translator'], function (translator) { buttons: { cancel: { label: '[[admin/manage/users:alerts.button-cancel]]', - className: 'btn-link' + className: 'btn-link', }, create: { label: '[[admin/manage/users:alerts.button-create]]', @@ -274,9 +274,9 @@ define('admin/manage/users', ['translator'], function (translator) { callback: function () { createUser.call(this); return false; - } - } - } + }, + }, + }, }); }); }); @@ -298,7 +298,7 @@ define('admin/manage/users', ['translator'], function (translator) { var user = { username: username, email: email, - password: password + password: password, }; socket.emit('admin.user.createUser', user, function (err) { diff --git a/public/src/admin/modules/colorpicker.js b/public/src/admin/modules/colorpicker.js index 47e129249a..84dbc5f052 100644 --- a/public/src/admin/modules/colorpicker.js +++ b/public/src/admin/modules/colorpicker.js @@ -19,7 +19,7 @@ define('admin/modules/colorpicker', function () { }, onShow: function (colpkr) { $(colpkr).css('z-index', 1051); - } + }, }); }); }; diff --git a/public/src/admin/modules/instance.js b/public/src/admin/modules/instance.js index 0b74ef3405..89e627d639 100644 --- a/public/src/admin/modules/instance.js +++ b/public/src/admin/modules/instance.js @@ -11,7 +11,7 @@ define('admin/modules/instance', function () { type: 'info', title: 'Reloading... ', message: 'NodeBB is reloading.', - timeout: 5000 + timeout: 5000, }); $(window).one('action:reconnected', function () { @@ -20,7 +20,7 @@ define('admin/modules/instance', function () { type: 'success', title: ' Success', message: 'NodeBB has reloaded successfully.', - timeout: 5000 + timeout: 5000, }); if (typeof callback === 'function') { @@ -37,7 +37,7 @@ define('admin/modules/instance', function () { type: 'info', title: 'Rebuilding... ', message: 'NodeBB is rebuilding front-end assets (css, javascript, etc).', - timeout: 10000 + timeout: 10000, }); $(window).one('action:reconnected', function () { @@ -46,7 +46,7 @@ define('admin/modules/instance', function () { type: 'success', title: ' Success', message: 'NodeBB has successfully restarted.', - timeout: 10000 + timeout: 10000, }); if (typeof callback === 'function') { @@ -60,7 +60,7 @@ define('admin/modules/instance', function () { type: 'info', title: 'Build Complete!... ', message: 'NodeBB is reloading.', - timeout: 10000 + timeout: 10000, }); }); }; diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index 29379f0dac..abdfed2936 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -21,7 +21,7 @@ define('admin/modules/search', ['mousetrap'], function (mousetrap) { // and wrap the match in a `.search-match` element .replace( new RegExp('^[\\s\\S]*?(.{0,25})(' + term + ')(.{0,25})[\\s\\S]*?$', 'gmi'), - '...$1$2$3...
' + '...$1$2$3...
', ) // collapse whitespace .replace(/(?:\n ?)+/g, '\n') @@ -29,7 +29,7 @@ define('admin/modules/search', ['mousetrap'], function (mousetrap) { title = title.replace( new RegExp('(^.*?)(' + term + ')(.*?$)', 'gi'), - '$1$2$3' + '$1$2$3', ); return '