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

Display a message when pinPads returns an error

Browse Source
This commit is contained in:
yflory
2017-05-22 10:41:47 +02:00
parent 67a04a16ec
commit 538aec6ef5
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/userObject.js
View File

@@ -575,7 +575,10 @@ define([
atime: +new Date(),
ctime: +new Date()
}, function (err) {
if (err) { return void cb(err); }
if (err) {
logError(err);
return void cb(err);
}
parentEl[fileName] = href;
var newPath = filePath.slice();
newPath.push(fileName);

9
www/drive/main.js
View File

@@ -1397,8 +1397,11 @@ define([
// Handlers
if (isInRoot) {
var onCreated = function (err, info) {
if (err && err === E_OVER_LIMIT) {
return void Cryptpad.alert(Messages.pinLimitDrive, null, true);
if (err) {
if (err === E_OVER_LIMIT) {
return void Cryptpad.alert(Messages.pinLimitDrive, null, true);
}
return void Cryptpad.alert(Messages.fm_error_cantPin);
}
module.newFolder = info.newPath;
refresh();
@@ -2361,7 +2364,7 @@ define([
return void Cryptpad.alert(Messages.pinLimitDrive, null, true);
}
if (err) {
return void console.error("Unable to create the file", err);
return void Cryptpad.alert(Messages.fm_error_cantPin);
}
module.newFolder = info.newPath;
refresh();