Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 23:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add tooltip in taskbar icons (#6693)

Browse Source 
* Add tooltip in taskbar icons

* Translate taskbar title when creating taskbar
This commit is contained in:
André Zanghelini
2018-09-17 17:23:06 -03:00
committed by Julian Lam
parent 382d06bbb0
commit f3956299eb
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ define('chat', [
sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid);
taskbar.push('chat', modal.attr('data-uuid'), {
title: data.roomName || username,
title: '[[modules:chat.chatting_with]] ' + (data.roomName || username),
touid: data.message.fromUser.uid,
roomId: data.roomId,
});
@@ -251,7 +251,7 @@ define('chat', [
Chats.addIPHandler(chatModal);
taskbar.push('chat', chatModal.attr('data-uuid'), {
title: data.roomName || (data.users.length ? data.users[0].username : ''),
title: '[[modules:chat.chatting_with]] ' + (data.roomName || (data.users.length ? data.users[0].username : '')),
roomId: data.roomId,
icon: 'fa-comment',
state: '',

47
public/src/modules/taskbar.js
View File

@@ -1,7 +1,7 @@
'use strict';
define('taskbar', ['benchpress'], function (Benchpress) {
define('taskbar', ['benchpress', 'translator'], function (Benchpress, translator) {
var taskbar = {};
taskbar.init = function () {
@@ -111,32 +111,35 @@ define('taskbar', ['benchpress'], function (Benchpress) {
}
function createTaskbar(data) {
var title = $('<div></div>').text(data.options.title || 'NodeBB Task').html();
translator.translate(data.options.title, function (taskTitle) {
var title = $('<div></div>').text(taskTitle || 'NodeBB Task').html();
var taskbarEl = $('<li />')
.addClass(data.options.className)
.html('<a href="#">' +
(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
(data.options.image ? '<img src="' + data.options.image + '"/> ' : '') +
'<span component="taskbar/title">' + title + '</span>' +
'</a>')
.attr({
'data-module': data.module,
'data-uuid': data.uuid,
})
.addClass(data.options.state !== undefined ? data.options.state : 'active');
var taskbarEl = $('<li />')
.addClass(data.options.className)
.html('<a href="#">' +
(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
(data.options.image ? '<img src="' + data.options.image + '"/> ' : '') +
'<span component="taskbar/title">' + title + '</span>' +
'</a>')
.attr({
title: title,
'data-module': data.module,
'data-uuid': data.uuid,
})
.addClass(data.options.state !== undefined ? data.options.state : 'active');
if (!data.options.state || data.options.state === 'active') {
minimizeAll();
}
if (!data.options.state || data.options.state === 'active') {
minimizeAll();
}
taskbar.tasklist.append(taskbarEl);
update();
taskbar.tasklist.append(taskbarEl);
update();
data.element = taskbarEl;
data.element = taskbarEl;
taskbarEl.data(data);
$(window).trigger('action:taskbar.pushed', data);
taskbarEl.data(data);
$(window).trigger('action:taskbar.pushed', data);
});
}
taskbar.updateTitle = function (module, uuid, newTitle) {