Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-16 18:06:19 -05:00
parent e061978bd5
commit 39b631a3a8
8 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/app.js
View File

@@ -253,7 +253,7 @@ var socket,
uids.push(this.getAttribute('data-uid'));
});
socket.emit('user.get_online_users', uids, function (users) {
socket.emit('user.getOnlineUsers', uids, function (err, users) {
jQuery('a.username-field').each(function () {
if (this.processed === true)
return;

28
public/src/forum/account.js
View File

@@ -37,14 +37,14 @@ define(['forum/accountheader'], function(header) {
followBtn.on('click', function() {
socket.emit('user.follow', {
uid: theirid
}, function(success) {
if (success) {
followBtn.addClass('hide');
unfollowBtn.removeClass('hide');
app.alertSuccess('You are now following ' + username + '!');
} else {
app.alertError('There was an error following' + username + '!');
}, function(err) {
if(err) {
return app.alertError('There was an error following' + username + '!');
}
followBtn.addClass('hide');
unfollowBtn.removeClass('hide');
app.alertSuccess('You are now following ' + username + '!');
});
return false;
});
@@ -52,14 +52,14 @@ define(['forum/accountheader'], function(header) {
unfollowBtn.on('click', function() {
socket.emit('user.unfollow', {
uid: theirid
}, function(success) {
if (success) {
followBtn.removeClass('hide');
unfollowBtn.addClass('hide');
app.alertSuccess('You are no longer following ' + username + '!');
} else {
app.alertError('There was an error unfollowing ' + username + '!');
}, function(err) {
if(err) {
return app.alertError('There was an error unfollowing ' + username + '!');
}
followBtn.removeClass('hide');
unfollowBtn.addClass('hide');
app.alertSuccess('You are no longer following ' + username + '!');
});
return false;
});

7
public/src/forum/accountsettings.js
View File

@@ -11,11 +11,10 @@ define(['forum/accountheader'], function(header) {
};
socket.emit('user.saveSettings', settings, function(err) {
if (!err) {
app.alertSuccess('Settings saved!');
} else {
app.alertError('There was an error saving settings!');
if (err) {
return app.alertError('There was an error saving settings!');
}
app.alertSuccess('Settings saved!');
});
return false;
});

11
public/src/forum/admin/footer.js
View File

@@ -15,6 +15,15 @@ jQuery('document').ready(function() {
}, false);
});
socket.emit('admin.config.get', function(config) {
socket.emit('admin.config.get', function(err, config) {
if(err) {
return app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Error',
message: 'NodeBB encountered a problem getting config',
type: 'danger'
});
}
app.config = config;
});

23
public/src/forum/admin/settings.js
View File

@@ -73,17 +73,9 @@ define(['uploader'], function(uploader) {
socket.emit('admin.config.set', {
key: key,
value: value
}, function(data) {
if (data.status === 'ok') {
app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Changes Saved',
message: 'Your changes to the NodeBB configuration have been saved.',
type: 'success'
});
} else {
app.alert({
}, function(err) {
if(err) {
return app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Changes Not Saved',
@@ -91,6 +83,15 @@ define(['uploader'], function(uploader) {
type: 'danger'
});
}
app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Changes Saved',
message: 'Your changes to the NodeBB configuration have been saved.',
type: 'success'
});
});
}
});

24
src/socket.io/admin.js
View File

@@ -233,26 +233,22 @@ SocketAdmin.plugins.toggle = function(socket, plugin_id) {
SocketAdmin.config = {};
SocketAdmin.config.get = function(socket, data, callback) {
meta.configs.list(function(err, config) {
if (!err) {
callback(config);
}
});
meta.configs.list(callback);
};
SocketAdmin.config.set = function(socket, data, callback) {
meta.configs.set(data.key, data.value, function(err) {
if (!err) {
callback({
status: 'ok'
});
plugins.fireHook('action:config.set', {
key: data.key,
value: data.value
});
if(err) {
return callback(err);
}
callback(null);
plugins.fireHook('action:config.set', {
key: data.key,
value: data.value
});
logger.monitorConfig({io: index.server}, data);
});
};

8
src/socket.io/user.js
View File

@@ -97,13 +97,11 @@ SocketUser.saveSettings = function(socket, data, callback) {
if (socket.uid) {
user.setUserFields(socket.uid, {
showemail: data.showemail
}, function(err, result) {
callback(err);
});
}, callback);
}
};
SocketUser.get_online_users = function(socket, data, callback) {
SocketUser.getOnlineUsers = function(socket, data, callback) {
var returnData = [];
for (var i = 0; i < data.length; ++i) {
@@ -115,7 +113,7 @@ SocketUser.get_online_users = function(socket, data, callback) {
}
}
callback(returnData);
callback(null, returnData);
};
SocketUser.getOnlineAnonCount = function(socket, data, callback) {

26
src/user.js
View File

@@ -537,31 +537,21 @@ var bcrypt = require('bcrypt'),
User.follow = function(uid, followid, callback) {
db.setAdd('following:' + uid, followid, function(err, data) {
if (!err) {
db.setAdd('followers:' + followid, uid, function(err, data) {
if (!err) {
callback(true);
} else {
console.log(err);
callback(false);
}
});
} else {
console.log(err);
callback(false);
if(err) {
return callback(err);
}
db.setAdd('followers:' + followid, uid, callback);
});
};
User.unfollow = function(uid, unfollowid, callback) {
db.setRemove('following:' + uid, unfollowid, function(err, data) {
if (!err) {
db.setRemove('followers:' + unfollowid, uid, function(err, data) {
callback(data);
});
} else {
console.log(err);
if(err) {
return callback(err);
}
db.setRemove('followers:' + unfollowid, uid, callback);
});
};