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

Change notifications behaviour whether they are archived or not

Browse Source
This commit is contained in:
ClemDee
2019-07-01 13:52:17 +02:00
parent 604358d5dc
commit 2bf4c07e35
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
www/common/notifications.js
View File

@@ -25,37 +25,44 @@ define([
handlers['FRIEND_REQUEST'] = function (common, data) { handlers['FRIEND_REQUEST'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
content.handler = function () {
UIElements.displayFriendRequestModal(common, data);
};
// Check authenticity // Check authenticity
if (msg.author !== msg.content.curvePublic) { return; } if (msg.author !== msg.content.curvePublic) { return; }
common.addFriendRequest(data);
// Display the notification // Display the notification
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_notification', [msg.content.displayName || Messages.anonymous]); return Messages._getKey('friendRequest_notification', [msg.content.displayName || Messages.anonymous]);
}; };
// if not archived, add handlers
if (!content.archived) {
content.handler = function () {
UIElements.displayFriendRequestModal(common, data);
};
common.addFriendRequest(data);
}
}; };
handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) { handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
content.dismissHandler = defaultDismiss(common, data);
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_accepted', [msg.content.name || Messages.anonymous]); return Messages._getKey('friendRequest_accepted', [msg.content.name || Messages.anonymous]);
}; };
if (!content.archived) {
content.dismissHandler = defaultDismiss(common, data);
}
}; };
handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) { handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
content.dismissHandler = defaultDismiss(common, data);
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_declined', [msg.content.name || Messages.anonymous]); return Messages._getKey('friendRequest_declined', [msg.content.name || Messages.anonymous]);
}; };
if (!content.archived) {
content.dismissHandler = defaultDismiss(common, data);
}
}; };
// Share pad // Share pad
@@ -67,13 +74,15 @@ define([
var key = type === 'drive' ? 'notification_folderShared' : var key = type === 'drive' ? 'notification_folderShared' :
(type === 'file' ? 'notification_fileShared' : (type === 'file' ? 'notification_fileShared' :
'notification_padShared'); 'notification_padShared');
content.handler = function () {
common.openURL(msg.content.href);
};
content.dismissHandler = defaultDismiss(common, data);
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]); return Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]);
}; };
content.handler = function () {
common.openURL(msg.content.href);
};
if (!content.archived) {
content.dismissHandler = defaultDismiss(common, data);
}
}; };
return { return {
@@ -83,8 +92,8 @@ define([
if (handlers[type]) { if (handlers[type]) {
handlers[type](common, data); handlers[type](common, data);
// add getters to access simply some informations // add getters to access simply some informations
data.content.isClickable = typeof data.content.handler === "function" && data.content.archived !== true; data.content.isClickable = typeof data.content.handler === "function";
data.content.isDismissible = typeof data.content.dismissHandler === "function" && data.content.archived !== true; data.content.isDismissible = typeof data.content.dismissHandler === "function";
} else { } else {
// $(el).find('.cp-notification-dismiss').css('display', 'flex'); // XXX // $(el).find('.cp-notification-dismiss').css('display', 'flex'); // XXX
} }