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

closes https://github.com/NodeBB/nodebb-theme-persona/issues/52

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-04-07 13:45:46 -04:00
parent 641c8991f9
commit dadbda98b7
6 changed files with 21 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/src/app.js
View File

@@ -473,6 +473,19 @@ app.cacheBuster = null;
}); });
} }
app.updateUserStatus = function(el, status) {
if (!el.length) {
return;
}
translator.translate('[[global:' + status + ']]', function(translated) {
el.removeClass('online offline dnd away')
.addClass(status)
.attr('title', translated)
.attr('data-original-title', translated);
});
};
function handleNewTopic() { function handleNewTopic() {
$('#content').on('click', '#new_topic', function() { $('#content').on('click', '#new_topic', function() {
require(['composer'], function(composer) { require(['composer'], function(composer) {

11
public/src/client/account/profile.js
View File

@@ -69,18 +69,11 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll',
} }
function onUserStatusChange(data) { function onUserStatusChange(data) {
var onlineStatus = $('.account-online-status'); if (parseInt(ajaxify.variables.get('theirid'), 10) !== parseInt(data.uid, 10)) {
if(parseInt(ajaxify.variables.get('theirid'), 10) !== parseInt(data.uid, 10)) {
return; return;
} }
translator.translate('[[global:' + data.status + ']]', function(translated) { app.updateUserStatus($('.account [component="user/status"]'), data.status);
onlineStatus.attr('class', 'account-online-status fa fa-circle status ' + data.status)
.attr('title', translated)
.attr('data-original-title', translated);
});
} }
function loadMorePosts(direction) { function loadMorePosts(direction) {

11
public/src/client/chats.js
View File

@@ -163,16 +163,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll', 'translator']
}); });
socket.on('event:user_status_change', function(data) { socket.on('event:user_status_change', function(data) {
var userEl = $('.chats-list li[data-uid="' + data.uid +'"]'); app.updateUserStatus($('.chats-list [data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
if (userEl.length) {
var statusEl = userEl.find('.status');
translator.translate('[[global:' + data.status + ']]', function(translated) {
statusEl.attr('class', 'fa fa-circle status ' + data.status)
.attr('title', translated)
.attr('data-original-title', translated);
});
}
}); });
}; };

11
public/src/client/topic/browsing.js
View File

@@ -48,20 +48,11 @@ define('forum/topic/browsing', ['translator'], function(translator) {
}; };
Browsing.onUserStatusChange = function(data) { Browsing.onUserStatusChange = function(data) {
updateOnlineIcon($('.username-field[data-uid="' + data.uid + '"]'), data.status); app.updateUserStatus($('[data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
updateBrowsingUsers(data); updateBrowsingUsers(data);
}; };
function updateOnlineIcon(el, status) {
translator.translate('[[global:' + status + ']]', function(translated) {
el.siblings('i')
.attr('class', 'fa fa-circle status ' + status)
.attr('title', translated)
.attr('data-original-title', translated);
});
}
function updateBrowsingUsers(data) { function updateBrowsingUsers(data) {
var activeEl = $('[component="topic/browsing/list"]'); var activeEl = $('[component="topic/browsing/list"]');
var user = activeEl.find('a[data-uid="'+ data.uid + '"]'); var user = activeEl.find('a[data-uid="'+ data.uid + '"]');

11
public/src/client/users.js
View File

@@ -182,17 +182,8 @@ define('forum/users', ['translator'], function(translator) {
if (data.status === 'offline') { if (data.status === 'offline') {
return; return;
} }
var usersContainer = $('#users-container');
var userEl = usersContainer.find('li[data-uid="' + data.uid +'"]');
if (userEl.length) { app.updateUserStatus($('#users-container [data-uid="' + data.uid +'"] [component="user/status"]'), data.status);
var statusEl = userEl.find('.status');
translator.translate('[[global:' + data.status + ']]', function(translated) {
statusEl.attr('class', 'fa fa-circle status ' + data.status)
.attr('title', translated)
.attr('data-original-title', translated);
});
}
} }
function getActiveSection() { function getActiveSection() {

12
public/src/modules/chat.js
View File

@@ -118,7 +118,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], fun
socket.on('event:user_status_change', function(data) { socket.on('event:user_status_change', function(data) {
var modal = module.getModal(data.uid); var modal = module.getModal(data.uid);
updateStatus(modal, data.status); app.updateUserStatus(modal.find('[component="user/status"]'), data.status);
}); });
}; };
@@ -153,20 +153,12 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], fun
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
updateStatus(chatModal, status);
});
}
function updateStatus(chatModal, status) { app.updateUserStatus(chatModal.find('[component="user/status"]'), status);
translator.translate('[[global:' + status + ']]', function(translated) {
chatModal.find('#chat-user-status').attr('class', 'fa fa-circle status ' + status)
.attr('title', translated)
.attr('data-original-title', translated);
}); });
} }
module.createModal = function(username, touid, callback) { module.createModal = function(username, touid, callback) {
templates.parse('chat', {}, function(chatTpl) { templates.parse('chat', {}, function(chatTpl) {
translator.translate(chatTpl, function (chatTpl) { translator.translate(chatTpl, function (chatTpl) {