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

Export folder is now working in drive

Browse Source
This commit is contained in:
ClemDee
2019-08-14 17:27:37 +02:00
parent 51241bda48
commit a0d85c6e34
3 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
www/common/sframe-common-file.js
View File

@@ -471,7 +471,7 @@ define([
width: progressValue * $pc.width() + 'px'
});
};
var updateProgress = function (progressValue) {
var updateDecryptProgress = function (progressValue) {
var text = Math.round(progressValue*100) + '%';
text += progressValue === 1 ? '' : ' (' + Messages.download_step2 + '...)';
$pv.text(text);
@@ -479,12 +479,19 @@ define([
width: progressValue * $pc.width()+'px'
});
};
var updateProgress = function (progressValue) {
var text = Math.round(progressValue*100) + '%';
$pv.text(text);
$pb.css({
width: progressValue * $pc.width()+'px'
});
};
var ctx = {
get: common.getPad,
sframeChan: sframeChan,
};
var dl = downloadFunction(ctx, data, function (err, obj) {
downloadFunction(ctx, data, function (err, obj) {
$link.prepend($('<span>', {'class': 'fa fa-external-link'}))
.attr('href', '#')
.click(function (e) {
@@ -496,16 +503,18 @@ define([
cb(err, obj);
}, {
progress: updateDLProgress,
progress2: updateProgress,
progress2: updateDecryptProgress,
folderProgress: updateProgress,
});
var $cancel = $('<span>', {'class': 'cp-fileupload-table-cancel-button fa fa-times'}).click(function () {
dl.cancel();
$cancel.remove();
$row.find('.cp-fileupload-table-progress-value').text(Messages.upload_cancelled);
done();
});
$row.find('.cp-fileupload-table-cancel').html('').append($cancel);
// var $cancel = $('<span>', {'class': 'cp-fileupload-table-cancel-button fa fa-times'}).click(function () {
// dl.cancel();
// $cancel.remove();
// $row.find('.cp-fileupload-table-progress-value').text(Messages.upload_cancelled);
// done();
// });
// $row.find('.cp-fileupload-table-cancel').html('').append($cancel);
$row.find('.cp-fileupload-table-cancel').html('');
};
@@ -528,6 +537,14 @@ define([
});
};
File.downloadFolder = function (data, cb) {
queue.push({
dl: function (file) { updateProgressbar(file, data, MakeBackup.downloadFolder, cb); },
size: 0,
name: data.folderName,
});
};
return File;
};