Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/src/forum/admin/users.js

@@ -1,3 +1,5 @@
+"use strict";
+/* global socket, define, templates, bootbox, app, ajaxify,  */
 define(function() {
 	var Users = {};
 
@@ -192,7 +194,7 @@ define(function() {
 
 						templates.preload_template('admin/users', function() {
 							templates['admin/users'].parse({users:[]});
-							var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
+							var html = templates.prepare(templates['admin/users'].blocks.users).parse({
 								users: data.users
 							}),
 								userListEl = document.querySelector('.users');
@@ -225,7 +227,7 @@ define(function() {
 			function onUsersLoaded(users) {
 				templates.preload_template('admin/users', function() {
 					templates['admin/users'].parse({users:[]});
-					var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
+					var html = templates.prepare(templates['admin/users'].blocks.users).parse({
 						users: users
 					});
 					html = $(html);

src/notifications.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var async = require('async'),
 	winston = require('winston'),
 	cron = require('cron').CronJob,
@@ -8,7 +10,6 @@ var async = require('async'),
 	User = require('./user');
 
 (function(Notifications) {
-	"use strict";
 
 	Notifications.init = function() {
 		if (process.env.NODE_ENV === 'development') {
@@ -63,11 +64,11 @@ var async = require('async'),
 
 	Notifications.create = function(data, callback) {
 		/**
-		 * data.uniqueId is used solely to override stale nids.
+		*data.uniqueId is used solely to override stale nids.
-		 * 		If a new nid is pushed to a user and an existing nid in the user's
+		*		If a new nid is pushed to a user and an existing nid in the user's
-		 *		(un)read list contains the same uniqueId, it will be removed, and
+		*		(un)read list contains the same uniqueId, it will be removed, and
-		 *		the new one put in its place.
+		*		the new one put in its place.
-		 */
+		*/
 
 		// Add default values to data Object if not already set
 		var	defaults = {
@@ -249,10 +250,10 @@ var async = require('async'),
 				async.each(expiredNids, function(nid, next) {
 					async.parallel([
 						function(next) {
-							db.setRemove('notifications', nid, next)
+							db.setRemove('notifications', nid, next);
 						},
 						function(next) {
-							db.delete('notifications:' + nid, next)
+							db.delete('notifications:' + nid, next);
 						}
 					], function(err) {
 						numPruned++;

src/plugins.js

@@ -419,7 +419,7 @@ var fs = require('fs'),
 					var templatesPath = path.join(__dirname, '../node_modules', plugin.id, plugin.templates);
 					utils.walk(templatesPath, function(err, pluginTemplates) {
 						pluginTemplates.forEach(function(pluginTemplate) {
-							templates[pluginTemplate.replace(templatesPath, '').substring(1)] = pluginTemplate;
+							templates["/" + pluginTemplate.replace(templatesPath, '').substring(1)] = pluginTemplate;
 						});
 
 						next(err);