Display the file size before downloading it

This commit is contained in:
yflory
2017-06-15 16:30:50 +02:00
parent 594405de73
commit 5bfd8470cb
4 changed files with 34 additions and 18 deletions

View File

@@ -26,6 +26,7 @@ define([
var $dlform = $iframe.find('#download-form');
var $dlview = $iframe.find('#download-view');
var $label = $form.find('label');
var $dllabel = $dlform.find('label span');
var $progress = $iframe.find('#progress');
var $body = $iframe.find('body');
@@ -60,13 +61,6 @@ define([
return data ? data.title : undefined;
};
var exportFile = function () {
var filename = Cryptpad.fixFileName(document.title);
if (!(typeof(filename) === 'string' && filename)) { return; }
var blob = new Blob([myFile], {type: myDataType});
saveAs(blob, filename);
};
Title = Cryptpad.createTitle({}, function(){}, Cryptpad);
var displayed = ['title', 'useradmin', 'newpad', 'limit', 'upgrade'];
@@ -88,11 +82,6 @@ define([
if (uploadMode) { toolbar.title.hide(); }
var $rightside = toolbar.$rightside;
var $export = Cryptpad.createButton('export', true, {}, exportFile);
$rightside.append($export);
Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle);
if (!uploadMode) {
@@ -123,7 +112,6 @@ define([
$appContainer.css('background', 'white');
}
$dlButton.addClass('btn btn-success');
Cryptpad.removeLoadingScreen();
})
.on('decryptionError', function (e) {
var error = e.originalEvent;
@@ -167,6 +155,10 @@ define([
var todoBigFile = function (sizeMb) {
$dlform.show();
Cryptpad.removeLoadingScreen();
$dllabel.append($('<br>'));
$dllabel.append(metadata.name);
$dllabel.append($('<br>'));
$dllabel.append(Messages._getKey('formattedMB', [sizeMb]));
var decrypting = false;
var onClick = function (ev) {
if (decrypting) { return; }
@@ -175,7 +167,6 @@ define([
displayFile(ev);
};
if (sizeMb < 5) { return void onClick(); }
Cryptpad.removeLoadingScreen();
$dlform.find('#dl, #progress').click(onClick);
};
Cryptpad.getFileSize(window.location.href, function (e, data) {