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

Merge branch 'staging' into creation

Browse Source
This commit is contained in:
yflory
2018-03-14 12:07:04 +01:00
parent b1d5beca6f e977b14c1b
commit 3eec812aff
13 changed files with 176 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-ui-elements.js
View File

@@ -2121,12 +2121,12 @@ define([
if (err.type === 'EEXPIRED') {
msg = Messages.expiredError;
if (err.loaded) {
msg += Messages.expiredErrorCopy;
msg += Messages.errorCopy;
}
} else if (err.type === 'EDELETED') {
msg = Messages.deletedError;
if (err.loaded) {
msg += Messages.expiredErrorCopy;
msg += Messages.errorCopy;
}
}
if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }