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

This commit is contained in:
yflory
2017-07-03 14:43:17 +02:00
9 changed files with 214 additions and 42 deletions

View File

@@ -185,9 +185,6 @@ define([
};
Cryptpad.getFileSize(window.location.href, function (e, data) {
if (e) {
// TODO when GET_FILE_SIZE is made unauthenticated
// you won't need to handle this error (there won't be one)
if (e === 'RPC_NOT_READY') { return todoBigFile(); }
return void Cryptpad.errorLoadingScreen(e);
}
var size = Cryptpad.bytesToMegabytes(data);