Merge branch 'master' into develop

src/controllers/unread.js

@@ -12,7 +12,7 @@ var helpers = require('./helpers');
 
 var unreadController = {};
 
-var validFilter = {'': true, 'new': true, 'watched': true};
+var validFilter = { '': true, new: true, watched: true };
 
 unreadController.get = function (req, res, next) {
 	var page = parseInt(req.query.page, 10) || 1;
@@ -32,7 +32,7 @@ unreadController.get = function (req, res, next) {
 				},
 				settings: function (next) {
 					user.getSettings(req.uid, next);
-				}
+				},
 			}, next);
 		},
 		function (_results, next) {
@@ -47,9 +47,9 @@ unreadController.get = function (req, res, next) {
 				start: start,
 				stop: stop,
 				filter: filter,
-				cutoff: cutoff
+				cutoff: cutoff,
 			}, next);
-		}
+		},
 	], function (err, data) {
 		if (err) {
 			return next(err);
@@ -67,7 +67,7 @@ unreadController.get = function (req, res, next) {
 		data.selectedCategory = results.watchedCategories.selectedCategory;
 
 		if (req.path.startsWith('/api/unread') || req.path.startsWith('/unread')) {
-			data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[unread:title]]'}]);
+			data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[unread:title]]' }]);
 		}
 
 		data.title = '[[pages:unread]]';
@@ -75,17 +75,17 @@ unreadController.get = function (req, res, next) {
 			name: '[[unread:all-topics]]',
 			url: 'unread',
 			selected: filter === '',
-			filter: ''
+			filter: '',
 		}, {
 			name: '[[unread:new-topics]]',
 			url: 'unread/new',
 			selected: filter === 'new',
-			filter: 'new'
+			filter: 'new',
 		}, {
 			name: '[[unread:watched-topics]]',
 			url: 'unread/watched',
 			selected: filter === 'watched',
-			filter: 'watched'
+			filter: 'watched',
 		}];
 
 		data.selectedFilter = data.filters.find(function (filter) {