Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread

Browse Source
This commit is contained in:
psychobunny
2013-05-06 03:41:22 +00:00
parent c906b7419a
commit 8a2c18de5b
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/webserver.js
View File

@@ -124,7 +124,7 @@ passport.deserializeUser(function(uid, done) {
// Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)
(function() {
var routes = ['', 'login', 'register'];
var routes = ['', 'login', 'register', 'account'];
for (var i=0, ii=routes.length; i<ii; i++) {
(function(route) {
@@ -178,6 +178,11 @@ passport.deserializeUser(function(uid, done) {
res.send(JSON.stringify(data));
}, req.params.id, (req.user) ? req.user.uid : 0);
break;
case 'account' :
get_account_fn(req, res, function(userData) {
res.send(JSON.stringify(userData));
});
break;
case 'confirm':
global.modules.user.email.confirm(req.params.id, function(data) {
if (data.status === 'ok') {
@@ -288,8 +293,9 @@ passport.deserializeUser(function(uid, done) {
});
});
app.get('/account', function(req, res) {
//to baris, move this into account.js or sth later - just moved this out here for you to utilize client side tpl parsing
//I didn't want to change too much so you should probably sort out the params etc
function get_account_fn(req, res, callback) {
console.log("GOING TO ACCOUNT");
if (req.user === undefined)
@@ -301,13 +307,11 @@ passport.deserializeUser(function(uid, done) {
console.log("user data" + JSON.stringify(data));
var account = templates['account'];
var userData = {user:data};
account = account.parse(userData);
res.send(templates['header'] + account + templates['footer']);
callback(userData);
});
});
}
app.get('/uid/:uid', function(req, res) {