hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
v1.18.x
Julian Lam 12 years ago
parent 84584a1b5b 96a779172b
commit 741a5843a1
10 changed files with 122 additions and 123 deletions
Show Stats Download Patch File Download Diff File

2
public/css/style.less
Unescape Escape View File

@ -350,7 +350,7 @@ footer.footer {
} }
} }
a:hover { a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
text-decoration:none; text-decoration:none;
} }

35
public/src/app.js
Unescape Escape View File

@ -230,6 +230,23 @@ var socket,
app.populate_online_users(); app.populate_online_users();
var url = window.location.href,
parts = url.split('/'),
active = parts[parts.length-1];
jQuery('.nav li').removeClass('active');
if(active) {
jQuery('.nav li a').each(function() {
var href = this.getAttribute('href');
if(active.match(/^users/))
active = 'users';
if (href.match(active)) {
jQuery(this.parentNode).addClass('active');
return false;
}
});
}
setTimeout(function() { setTimeout(function() {
window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. window.scrollTo(0, 1); // rehide address bar on mobile after page load completes.
}, 100); }, 100);
@ -237,24 +254,6 @@ var socket,
jQuery('document').ready(function() { jQuery('document').ready(function() {
// On menu click, change "active" state
var menuEl = document.querySelector('.nav'),
liEls = menuEl.querySelectorAll('li'),
logoutEl = document.getElementById('logout'),
parentEl;
menuEl.addEventListener('click', function(e) {
parentEl = e.target.parentNode;
if (parentEl.nodeName === 'LI') {
for(var x=0,numLis=liEls.length;x<numLis;x++) {
if (liEls[x] !== parentEl) liEls[x].className = '';
else parentEl.className = 'active';
}
}
}, false);
addTouchEvents(); addTouchEvents();
}); });

13
src/admin/categories.js
Unescape Escape View File

@ -41,25 +41,12 @@ var RDB = require('./../redis.js'),
var slug = cid + '/' + utils.slugify(category[key]); var slug = cid + '/' + utils.slugify(category[key]);
RDB.hset('category:' + cid, 'slug', slug); RDB.hset('category:' + cid, 'slug', slug);
RDB.set('categoryslug:' + slug + ':cid', cid); RDB.set('categoryslug:' + slug + ':cid', cid);
RDB.smembers('categories:' + cid + ':tid', function(err, tids) {
var pipe = RDB.multi();
for (var tid in tids) {
pipe.set(schema.topics(tid).category_name, category[key]);
pipe.set(schema.topics(tid).category_slug, slug);
}
pipe.exec();
});
} }
} }
updated.push(cid); updated.push(cid);
} }
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Updated Categories', title: 'Updated Categories',
message: 'Category IDs ' + updated.join(', ') + ' was successfully updated.', message: 'Category IDs ' + updated.join(', ') + ' was successfully updated.',

55
src/categories.js
Unescape Escape View File

@ -9,9 +9,9 @@ var RDB = require('./redis.js'),
Categories.getCategoryById = function(category_id, current_user, callback) { Categories.getCategoryById = function(category_id, current_user, callback) {
Categories.getCategoryData(category_id, function(categoryData) { Categories.getCategoryData(category_id, function(err, categoryData) {
if(!categoryData) { if(err) {
callback(false); callback(false);
return; return;
} }
@ -341,12 +341,16 @@ var RDB = require('./redis.js'),
} }
Categories.getCategoryData = function(cid, callback) { Categories.getCategoryData = function(cid, callback) {
RDB.hgetall('category:' + cid, function(err, data) { RDB.hgetall('category:' + cid, callback);
if(err === null) }
Categories.getCategoryFields = function(cid, fields, callback) {
RDB.hmgetObject('category:' + cid, fields, function(err, data) {
if(err === null)
callback(data); callback(data);
else else
console.log(err); console.log(err);
}); });
} }
Categories.setCategoryField = function(cid, field, value) { Categories.setCategoryField = function(cid, field, value) {
@ -358,32 +362,41 @@ var RDB = require('./redis.js'),
} }
Categories.getCategories = function(cids, callback, current_user) { Categories.getCategories = function(cids, callback, current_user) {
if (!cids || cids.length === 0) { if (!cids || !Array.isArray(cids) || cids.length === 0) {
callback({'categories' : []}); callback({'categories' : []});
return; return;
} }
var categories = []; var categories = [];
for(var i=0; i<cids.length; ++i) { function getCategory(cid, callback) {
Categories.getCategoryData(cids[i], function(categoryData) { Categories.getCategoryData(cid, function(err, categoryData) {
if(!categoryData) if(err) {
callback(err);
return; return;
}
Categories.hasReadCategory(categoryData.cid, current_user, function(hasRead) { Categories.hasReadCategory(cid, current_user, function(hasRead) {
categoryData['badgeclass'] = (parseInt(categoryData.topic_count,10) === 0 || (hasRead && current_user != 0)) ? '' : 'badge-important'; categoryData['badgeclass'] = (parseInt(categoryData.topic_count,10) === 0 || (hasRead && current_user != 0)) ? '' : 'badge-important';
categories.push(categoryData); categories.push(categoryData);
callback(null);
if(categories.length === cids.length)
callback({'categories': categories});
}) ; }) ;
}); });
} }
};
async.eachSeries(cids, getCategory, function(err) {
if(err) {
console.log(err);
callback(null);
return;
}
callback({'categories': categories});
});
};
}(exports));
}(exports));

45
src/posts.js
Unescape Escape View File

@ -86,19 +86,14 @@ var RDB = require('./redis.js'),
}); });
} }
Posts.getPostFields = function(uid, fields, callback) { Posts.getPostFields = function(pid, fields, callback) {
RDB.hmget('post:' + uid, fields, function(err, data) { RDB.hmgetObject('post:' + pid, fields, function(err, data) {
if(err === null) { if(err === null) {
var returnData = {}; callback(data);
for(var i=0, ii=fields.length; i<ii; ++i) {
returnData[fields[i]] = data[i];
}
callback(returnData);
} }
else else {
console.log(err); console.log(err);
}
}); });
} }
@ -343,18 +338,24 @@ var RDB = require('./redis.js'),
} }
}); });
} }
async.each(images, uploadImage, function(err) { if(!images) {
if(!err) { postData.uploadedImages = JSON.stringify(uploadedImages);
postData.uploadedImages = JSON.stringify(uploadedImages); Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages);
Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages); callback(postData);
} else {
callback(postData); async.each(images, uploadImage, function(err) {
} else { if(!err) {
console.log(err); postData.uploadedImages = JSON.stringify(uploadedImages);
callback(null); Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages);
}
}); callback(postData);
} else {
console.log(err);
callback(null);
}
});
}
}); });
} else { } else {
callback(null); callback(null);

42
src/redis.js
Unescape Escape View File

@ -37,28 +37,26 @@
}; };
/* /*
* A lot of redis calls come back like this: * gets fields of a hash as an object instead of an array
* [key, value, key, value, key, value] */
* this is a simple utility fn to turn this into an object. RedisDB.exports.hmgetObject = function (key, fields, callback) {
*/ RedisDB.exports.hmget(key, fields, function(err, data) {
RedisDB.exports.objectify = function(arr) { if(err === null) {
var obj = {}; var returnData = {};
for (var i = 0; i < arr.length; i += 2) {
obj[arr[i]] = arr[i+1]; for(var i=0, ii=fields.length; i<ii; ++i) {
} returnData[fields[i]] = data[i];
return obj; }
};
callback(null, returnData);
}
else {
console.log(err);
callback(err, null);
}
});
}
/*
* Similar to .objectify, this utility function splits the data array into two arrays
*/
RedisDB.exports.splitify = function(arr) {
var arr1 = [], arr2 = [];
for (var i = 0; i < arr.length; i += 2) {
arr1.push(arr[i]);
arr2.push(arr[i+1]);
}
return [arr1,arr2];
};
}(module)); }(module));

5
src/threadTools.js
Unescape Escape View File

@ -180,11 +180,6 @@ var RDB = require('./redis.js'),
categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1); categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
categories.incrementCategoryFieldBy(cid, 'topic_count', 1); categories.incrementCategoryFieldBy(cid, 'topic_count', 1);
categories.getCategories([cid], function(data) {
topics.setTopicField(tid, 'category_name', data.categories[0].name);
topics.setTopicField(tid, 'category_slug', data.categories[0].slug);
});
socket.emit('api:topic.move', { socket.emit('api:topic.move', {
status: 'ok' status: 'ok'
}); });

35
src/topics.js
Unescape Escape View File

@ -84,9 +84,16 @@ marked.setOptions({
}); });
} }
Topics.getCategoryData = function(tid, callback) {
Topics.getTopicField(tid, 'cid', function(cid) {
categories.getCategoryData(cid, callback);
});
}
Topics.getTopicWithPosts = function(tid, current_user, callback) { Topics.getTopicWithPosts = function(tid, current_user, callback) {
threadTools.exists(tid, function(exists) { threadTools.exists(tid, function(exists) {
if (!exists) return callback(new Error('Topic tid \'' + tid + '\' not found')); if (!exists)
return callback(new Error('Topic tid \'' + tid + '\' not found'));
Topics.markAsRead(tid, current_user); Topics.markAsRead(tid, current_user);
@ -108,19 +115,29 @@ marked.setOptions({
next(null, privData); next(null, privData);
}); });
} }
function getCategoryData(next) {
Topics.getCategoryData(tid, next);
}
async.parallel([getTopicData, getTopicPosts, getPrivileges], function(err, results) { async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData], function(err, results) {
if (err) console.log(err.message); if (err) {
console.log(err.message);
callback(err, null);
return;
}
var topicData = results[0], var topicData = results[0],
topicPosts = results[1], topicPosts = results[1],
privileges = results[2]; privileges = results[2],
categoryData = results[3];
var main_posts = topicPosts.splice(0, 1); var main_posts = topicPosts.splice(0, 1);
callback(null, { callback(null, {
'topic_name':topicData.title, 'topic_name':topicData.title,
'category_name':topicData.category_name, 'category_name':categoryData.name,
'category_slug':topicData.category_slug, 'category_slug':categoryData.slug,
'locked': topicData.locked, 'locked': topicData.locked,
'deleted': topicData.deleted, 'deleted': topicData.deleted,
'pinned': topicData.pinned, 'pinned': topicData.pinned,
@ -410,12 +427,6 @@ marked.setOptions({
// in future it may be possible to add topics to several categories, so leaving the door open here. // in future it may be possible to add topics to several categories, so leaving the door open here.
RDB.sadd('categories:' + category_id + ':tid', tid); RDB.sadd('categories:' + category_id + ':tid', tid);
categories.getCategories([category_id], function(data) {
Topics.setTopicField(tid, 'category_name', data.categories[0].name);
Topics.setTopicField(tid, 'category_slug', data.categories[0].slug);
});
RDB.hincrby('category:' + category_id, 'topic_count', 1); RDB.hincrby('category:' + category_id, 'topic_count', 1);
RDB.incr('totaltopiccount'); RDB.incr('totaltopiccount');

10
src/user.js
Unescape Escape View File

@ -126,13 +126,9 @@ var utils = require('./../public/src/utils.js'),
} }
User.getUserFields = function(uid, fields, callback) { User.getUserFields = function(uid, fields, callback) {
RDB.hmget('user:' + uid, fields, function(err, data) { RDB.hmgetObject('user:' + uid, fields, function(err, data) {
if(err === null) { if(err === null) {
for(var i = 0, returnData = {}, ii=fields.length; i<ii; ++i) { callback(data);
returnData[fields[i]] = data[i];
}
callback(returnData);
} else { } else {
console.log(err); console.log(err);
} }
@ -141,7 +137,7 @@ var utils = require('./../public/src/utils.js'),
User.getMultipleUserFields = function(uids, fields, callback) { User.getMultipleUserFields = function(uids, fields, callback) {
if(uids.length === 0) { if(uids.length === 0) {
callback({}); callback([]);
return; return;
} }

3
src/webserver.js
Unescape Escape View File

@ -38,7 +38,6 @@ var express = require('express'),
// Middlewares // Middlewares
app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico'))); app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') })); app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') }));
//app.use(express.static(path.join(__dirname, '../', 'public')));
app.use(global.nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public'))); app.use(global.nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
app.use(express.bodyParser()); // Puts POST vars in request.body app.use(express.bodyParser()); // Puts POST vars in request.body
app.use(express.cookieParser()); // If you want to parse cookies (res.cookies) app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
@ -252,7 +251,7 @@ var express = require('express'),
app.get('/api/:method/:id*', api_method); app.get('/api/:method/:id*', api_method);
app.get('/cid/:cid', function(req, res) { app.get('/cid/:cid', function(req, res) {
categories.getCategoryData(req.params.cid, function(data){ categories.getCategoryData(req.params.cid, function(err, data) {
if(data) if(data)
res.send(data); res.send(data);
else else

Write Preview
Loading…
Cancel
Save