infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Improve error message when opening an expired pad

pull/1/head
yflory 2020-06-26 15:42:50 +02:00
parent 163c6556a0
commit 74b379999e
1 changed files with 9 additions and 1 deletions

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

@ -288,7 +288,15 @@ define([
var newHref;
var expire;
nThen(function (w) {
if (parsed.hashData.key || !parsed.hashData.channel) { return; }
// If we're using an unsafe link, get pad attribute
if (parsed.hashData.key || !parsed.hashData.channel) {
Cryptpad.getPadAttribute('expire', w(function (err, data) {
if (err) { return; }
expire = data;
}));
return;
}
// Otherwise, get pad data from channel id
var edit = parsed.hashData.mode === 'edit';
Cryptpad.getPadDataFromChannel({
channel: parsed.hashData.channel,