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

fix merge conflicts

Browse Source
This commit is contained in:
ansuz
2017-05-22 12:11:24 +02:00
parent 6e7fe87974 c45f08f147
commit 5179252d3b
11 changed files with 105 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
www/file/main.js
View File

@@ -21,8 +21,9 @@ define([
var ifrw = $('#pad-iframe')[0].contentWindow;
var $iframe = $('#pad-iframe').contents();
var $form = $iframe.find('#upload-form');
//var $progress = $form.find('#progress');
var $dlform = $iframe.find('#download-form');
var $label = $form.find('label');
var $dllabel = $dlform.find('label');
var $table = $iframe.find('#status');
Cryptpad.addLoadingScreen();
@@ -100,8 +101,6 @@ define([
var b64Key = Nacl.util.encodeBase64(key);
Cryptpad.replaceHash(Cryptpad.getFileHashFromKeys(id, b64Key));
//$form.hide();
APP.toolbar.addElement(['fileshare'], {});
var title = document.title = metadata.name;
@@ -181,11 +180,10 @@ define([
$tr.find('.progressValue').text(Messages.upload_cancelled);
});
var $tr2 = $('<tr>', {id: id}).appendTo($table);
$('<td>').text(obj.metadata.name).appendTo($tr2);
$('<td>').text(prettySize(estimate)).appendTo($tr2);
$('<td>', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr2);
$('<td>', {'class': 'upCancel'}).append($cancel).appendTo($tr2);
$('<td>').text(obj.metadata.name).appendTo($tr);
$('<td>').text(prettySize(estimate)).appendTo($tr);
$('<td>', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr);
$('<td>', {'class': 'upCancel'}).append($cancel).appendTo($tr);
queue.next();
};
@@ -251,32 +249,38 @@ define([
Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle);
if (!uploadMode) {
var src = Cryptpad.getBlobPathFromHex(hexFileName);
return Cryptpad.fetch(src, function (e, u8) {
if (e) { return void Cryptpad.alert(e); }
// now decrypt the u8
var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey);
$dlform.show();
Cryptpad.removeLoadingScreen();
$dlform.find('#dl').click(function (e) {
if (myFile) { return void exportFile(); }
if (!u8 || !u8.length) {
return void Cryptpad.errorLoadingScreen(e);
}
var src = Cryptpad.getBlobPathFromHex(hexFileName);
return Cryptpad.fetch(src, function (e, u8) {
if (e) { return void Cryptpad.alert(e); }
// now decrypt the u8
var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey);
FileCrypto.decrypt(u8, key, function (e, data) {
if (e) {
Cryptpad.removeLoadingScreen();
return console.error(e);
if (!u8 || !u8.length) {
return void Cryptpad.errorLoadingScreen(e);
}
console.log(data);
var title = document.title = data.metadata.name;
myFile = data.content;
myDataType = data.metadata.type;
Title.updateTitle(title || Title.defaultTitle);
Cryptpad.removeLoadingScreen();
}, function (progress) {
console.error(progress);
FileCrypto.decrypt(u8, key, function (e, data) {
if (e) {
return console.error(e);
}
console.log(data);
var title = document.title = data.metadata.name;
myFile = data.content;
myDataType = data.metadata.type;
Title.updateTitle(title || Title.defaultTitle);
exportFile();
}, function (progress) {
console.error(progress);
});
});
});
return;
}
if (!Cryptpad.isLoggedIn()) {