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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2019-09-03 18:08:11 +02:00
commit cdb98ee27f
4 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/notifications.js
View File

@ -134,6 +134,7 @@ define([
}; };
// if not archived, add handlers // if not archived, add handlers
if (!content.archived) {
content.handler = function () { content.handler = function () {
var metadataMgr = common.getMetadataMgr(); var metadataMgr = common.getMetadataMgr();
var priv = metadataMgr.getPrivateData(); var priv = metadataMgr.getPrivateData();
@ -181,7 +182,6 @@ define([
}); });
}; };
if (!content.archived) {
content.dismissHandler = defaultDismiss(common, data); content.dismissHandler = defaultDismiss(common, data);
} }
}; };
@ -284,5 +284,6 @@ define([
remove: function (common, data) { remove: function (common, data) {
common.removeFriendRequest(data.hash); common.removeFriendRequest(data.hash);
}, },
allowed: Object.keys(handlers)
}; };
}); });

1
www/common/outer/mailbox.js
View File

@ -343,6 +343,7 @@ proxy.mailboxes = {
try { try {
var decrypted = box.encryptor.decrypt(_msg[4]); var decrypted = box.encryptor.decrypt(_msg[4]);
message = JSON.parse(decrypted.content); message = JSON.parse(decrypted.content);
message.author = decrypted.author;
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }

2
www/notifications/app-notifications.less
View File

@ -105,6 +105,8 @@
p { p {
display: inline-block; display: inline-block;
margin: 1rem 1rem; margin: 1rem 1rem;
flex: 1;
min-width: 0;
} }
.notification-time { .notification-time {
margin: 1rem 1rem; margin: 1rem 1rem;

6
www/notifications/inner.js
View File

@ -8,6 +8,7 @@ define([
'/common/hyperscript.js', '/common/hyperscript.js',
'/customize/messages.js', '/customize/messages.js',
'/common/common-interface.js', '/common/common-interface.js',
'/common/notifications.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
@ -21,7 +22,8 @@ define([
SFCommon, SFCommon,
h, h,
Messages, Messages,
UI UI,
Notifications
) )
{ {
var APP = {}; var APP = {};
@ -44,7 +46,7 @@ define([
], ],
}; };
var notifsAllowedTypes = ["FRIEND_REQUEST", "FRIEND_REQUEST_ACCEPTED", "FRIEND_REQUEST_DECLINED", "SHARE_PAD", "REQUEST_PAD_ACCESS"]; var notifsAllowedTypes = Notifications.allowed;
var create = {}; var create = {};