Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 19:08:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
psychobunny
2014-03-12 16:02:03 -04:00
parent 44a91fe9ea 2220483915
commit e9fb2f4135
4 changed files with 35 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/forum/admin/users.js
View File

@@ -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);

1686
public/vendor/xregexp/xregexp.js vendored
View File

File diff suppressed because it is too large Load Diff

17
src/notifications.js
View File

@@ -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.
* 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
* the new one put in its place.
*/
*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
* (un)read list contains the same uniqueId, it will be removed, and
* 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++;

2
src/plugins.js
View File

@@ -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);