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

www/common/notifications.js

@@ -134,54 +134,54 @@ define([
         };
 
         // if not archived, add handlers
-        content.handler = function () {
+        if (!content.archived) {
-            var metadataMgr = common.getMetadataMgr();
+            content.handler = function () {
-            var priv = metadataMgr.getPrivateData();
+                var metadataMgr = common.getMetadataMgr();
-
+                var priv = metadataMgr.getPrivateData();
-            var link = h('a', {
+
-                href: '#'
+                var link = h('a', {
-            }, Messages.requestEdit_viewPad);
+                    href: '#'
-            var verified = h('p');
+                }, Messages.requestEdit_viewPad);
-            var $verified = $(verified);
+                var verified = h('p');
-
+                var $verified = $(verified);
-            var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
+
-            var title = Util.fixHTML(msg.content.title);
+                var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
-
+                var title = Util.fixHTML(msg.content.title);
-            if (priv.friends && priv.friends[msg.author]) {
+
-                $verified.addClass('cp-notifications-requestedit-verified');
+                if (priv.friends && priv.friends[msg.author]) {
-                var f = priv.friends[msg.author];
+                    $verified.addClass('cp-notifications-requestedit-verified');
-                $verified.append(h('span.fa.fa-certificate'));
+                    var f = priv.friends[msg.author];
-                var $avatar = $(h('span.cp-avatar')).appendTo($verified);
+                    $verified.append(h('span.fa.fa-certificate'));
-                $verified.append(h('p', Messages._getKey('requestEdit_fromFriend', [f.displayName])));
+                    var $avatar = $(h('span.cp-avatar')).appendTo($verified);
-                common.displayAvatar($avatar, f.avatar, f.displayName);
+                    $verified.append(h('p', Messages._getKey('requestEdit_fromFriend', [f.displayName])));
-            } else {
+                    common.displayAvatar($avatar, f.avatar, f.displayName);
-                $verified.append(Messages._getKey('requestEdit_fromStranger', [name]));
+                } else {
-            }
+                    $verified.append(Messages._getKey('requestEdit_fromStranger', [name]));
+                }
 
-            var div = h('div', [
+                var div = h('div', [
-                UI.setHTML(h('p'), Messages._getKey('requestEdit_confirm', [title, name])),
+                    UI.setHTML(h('p'), Messages._getKey('requestEdit_confirm', [title, name])),
-                verified,
+                    verified,
-                link
+                    link
-            ]);
+                ]);
-            $(link).click(function (e) {
+                $(link).click(function (e) {
-                e.preventDefault();
+                    e.preventDefault();
-                e.stopPropagation();
+                    e.stopPropagation();
-                common.openURL(msg.content.href);
+                    common.openURL(msg.content.href);
-            });
-            UI.confirm(div, function (yes) {
-                if (!yes) { return; }
-                common.getSframeChannel().event('EV_GIVE_ACCESS', {
-                    channel: msg.content.channel,
-                    user: msg.content.user
                 });
-                defaultDismiss(common, data)();
+                UI.confirm(div, function (yes) {
-            }, {
+                    if (!yes) { return; }
-                ok: Messages.friendRequest_accept,
+                    common.getSframeChannel().event('EV_GIVE_ACCESS', {
-                cancel: Messages.later
+                        channel: msg.content.channel,
-            });
+                        user: msg.content.user
-        };
+                    });
+                    defaultDismiss(common, data)();
+                }, {
+                    ok: Messages.friendRequest_accept,
+                    cancel: Messages.later
+                });
+            };
 
-        if (!content.archived) {
             content.dismissHandler = defaultDismiss(common, data);
         }
     };
@@ -284,5 +284,6 @@ define([
         remove: function (common, data) {
             common.removeFriendRequest(data.hash);
         },
+        allowed: Object.keys(handlers)
     };
 });

www/common/outer/mailbox.js

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

www/notifications/app-notifications.less

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

www/notifications/inner.js

@@ -8,6 +8,7 @@ define([
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/common/common-interface.js',
+    '/common/notifications.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -21,7 +22,8 @@ define([
     SFCommon,
     h,
     Messages,
-    UI
+    UI,
+    Notifications
     )
 {
     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 = {};