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

Don't ask for password when receiving a pad from the notifications

Browse Source
This commit is contained in:
yflory 2019-07-01 18:19:38 +02:00
parent 7a0f30488c
commit 520655856b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/notifications.js
View File

@ -57,7 +57,12 @@ define([
.html(Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title])); .html(Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]));
$(el).find('.cp-notification-content').addClass("cp-clickable") $(el).find('.cp-notification-content').addClass("cp-clickable")
.click(function () { .click(function () {
common.openURL(msg.content.href); var todo = function () { common.openURL(msg.content.href); };
if (!msg.content.password) { return void todo(); }
common.getSframeChannel().query('Q_SESSIONSTORAGE_PUT', {
key: 'newPadPassword',
value: msg.content.password
}, todo);
}); });
$(el).find('.cp-notification-dismiss').css('display', 'flex'); $(el).find('.cp-notification-dismiss').css('display', 'flex');
}; };

5
www/common/sframe-common-outer.js
View File

@ -223,6 +223,11 @@ define([
sframeChan.event("EV_PAD_PASSWORD"); sframeChan.event("EV_PAD_PASSWORD");
}; };
if (!val && sessionStorage.newPadPassword) {
val = sessionStorage.newPadPassword;
delete sessionStorage.newPadPassword;
}
if (val) { if (val) {
password = val; password = val;
Cryptpad.getFileSize(window.location.href, password, waitFor(function (e, size) { Cryptpad.getFileSize(window.location.href, password, waitFor(function (e, size) {