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

minor tweaks to status

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-31 16:21:41 -05:00
parent feaea6dcea
commit c2746b3bb1
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/app.js
View File

@@ -458,6 +458,13 @@ var socket,
}); });
}; };
function updateOnlineStatus(uid) {
socket.emit('user.isOnline', uid, function(err, data) {
$('#logged-in-menu #user_label #user-profile-link>i').attr('class', 'fa fa-circle status-' + data.status);
});
}
app.updateHeader = function(err, data) { app.updateHeader = function(err, data) {
$('#search-button').off().on('click', function(e) { $('#search-button').off().on('click', function(e) {
e.stopPropagation(); e.stopPropagation();
@@ -500,11 +507,14 @@ var socket,
userLabel.find('img').attr('src', data.picture); userLabel.find('img').attr('src', data.picture);
} }
if (data.username) { if (data.username) {
userLabel.find('#user-profile-link>span').html(data.username); userLabel.find('#user-profile-link>span').html(' ' + data.username);
} }
$('#logout-link').on('click', app.logout); $('#logout-link').on('click', app.logout);
} }
updateOnlineStatus(data.uid);
} else { } else {
if (allowGuestSearching) { if (allowGuestSearching) {
$('#search-button').removeClass("hide").show(); $('#search-button').removeClass("hide").show();
@@ -528,12 +538,14 @@ var socket,
} }
}); });
$('#user-control-list .user-status').off('click').on('click', function() { $('#user-control-list .user-status').off('click').on('click', function(e) {
socket.emit('user.setStatus', $(this).attr('data-status'), function(err) { socket.emit('user.setStatus', $(this).attr('data-status'), function(err, data) {
if(err) { if(err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
updateOnlineStatus(data.uid);
}); });
e.preventDefault();
}); });
}; };

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

@@ -203,6 +203,7 @@ SocketUser.setStatus = function(socket, status, callback) {
user.setUserField(socket.uid, 'status', status, function(err) { user.setUserField(socket.uid, 'status', status, function(err) {
SocketUser.isOnline(socket, socket.uid, function(err, data) { SocketUser.isOnline(socket, socket.uid, function(err, data) {
server.server.sockets.emit('user.isOnline', err, data); server.server.sockets.emit('user.isOnline', err, data);
callback(err, data);
}); });
}); });
}; };