web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separate notification data from its element contruction

Browse Source
This commit is contained in:
ClemDee
2019-06-27 09:51:23 +02:00
parent 2d6e8754be
commit bea13317fe
2 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
www/common/sframe-common-mailbox.js
View File

@@ -49,28 +49,28 @@ define([
};
var createElement = function (data) {
var notif;
var dismissIcon = h('span.fa.fa-times');
var dismiss = h('div.cp-notification-dismiss', {
title: Messages.notifications_dismiss
}, dismissIcon);
dismiss.addEventListener('click', function (e) {
e.preventDefault();
e.stopPropagation();
mailbox.dismiss(data, function (err) {
if (err) { return void console.error(err); }
/*if (notif && notif.parentNode) {
try {
notif.parentNode.removeChild(notif);
} catch (e) { console.error(e); }
}*/
});
});
notif = h('div.cp-notification', {
'data-hash': data.content.hash
}, [
h('div.cp-notification-content', h('p', formatData(data))),
dismiss
]);
}, [h('div.cp-notification-content', h('p', formatData(data)))]);
if (data.content.getFormatText) {
$(notif).find('.cp-notification-content p').html(data.content.getFormatText());
}
if (data.content.isClickable) {
$(notif).find('.cp-notification-content').addClass("cp-clickable")
.click(data.content.handler);
}
if (data.content.isDismissible) {
var dismissIcon = h('span.fa.fa-times');
var dismiss = h('div.cp-notification-dismiss', {
title: Messages.notifications_dismiss
}, dismissIcon);
$(dismiss).css('display', 'flex'); // XXX
$(dismiss).addClass("cp-clickable")
.click(data.content.dismissHandler);
$(notif).append(dismiss);
}
return notif;
};
@@ -92,8 +92,9 @@ define([
try {
var el;
if (data.type === 'notifications') {
Notifications.add(Common, data);
console.log(data);
el = createElement(data);
Notifications.add(Common, data, el);
}
f(data, el);
} catch (e) {
@@ -123,7 +124,6 @@ define([
var onMessage = function (data) {
// data = { type: 'type', content: {msg: 'msg', hash: 'hash'} }
console.log(data.content);
pushMessage(data);
if (!history[data.type]) { history[data.type] = []; }
history[data.type].push(data.content);