matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

onDrop File/Directory Upload Bug Fix

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-22 20:56:22 -07:00
parent 143d253311
commit 907791f8c8
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
renderer/uploads.js
View File

@@ -552,12 +552,10 @@ class Uploads {
GlobalUploadHash = ""; GlobalUploadHash = "";
GlobalUploadPath = ""; GlobalUploadPath = "";
GlobalContractCost = 0; GlobalContractCost = 0;
var TableBody = document.getElementById("file-history-body");
TableBody.innerHTML = '<tr class="empty-row"><td colspan="4">There are no files awaiting upload</td></tr>';
var duration = document.getElementById('contract-duration').value; var duration = document.getElementById('contract-duration').value;
GlobalContractDuration = duration; GlobalContractDuration = duration;
GlobalContractCost = ((GlobalUploadSize / 1048576) * GlobalHostingCost) * (duration / 46522); GlobalContractCost = ((GlobalUploadSize / 1048576) * GlobalHostingCost) * (duration / 46522);
document.getElementById("contract-cost").innerHTML = round(ContractCost, 2); document.getElementById("contract-cost").innerHTML = EthoUploads.round(GlobalContractCost, 2);
document.getElementById("upload-hash").innerHTML = ""; document.getElementById("upload-hash").innerHTML = "";
document.getElementById("upload-size").innerHTML = 0; document.getElementById("upload-size").innerHTML = 0;
GlobalContractCost = 0; GlobalContractCost = 0;
@@ -914,9 +912,13 @@ class Uploads {
} }
resetFileTable() { resetFileTable() {
if (typeof ($fileHistory) != 'undefined' && $fileHistory != null) {
while ($fileHistory.hasChildNodes()) { while ($fileHistory.hasChildNodes()) {
$fileHistory.removeChild($fileHistory.firstChild); $fileHistory.removeChild($fileHistory.firstChild);
} }
//var TableBody = document.getElementById("file-history-body");
//TableBody.innerHTML = '<tr class="empty-row"><td colspan="4">There are no files awaiting upload</td></tr>';
}
} }
onDragEnter(event) { onDragEnter(event) {
@@ -1137,9 +1139,8 @@ class Uploads {
} }
resetUploadProcess() { resetUploadProcess() {
EthoUploads.resetFileTable();
EthoUploads.updateUploadProgress(0); EthoUploads.updateUploadProgress(0);
$uploadMessage.innerText = "Preparing Upload"; //$uploadMessage.innerText = "Preparing Upload";
document.getElementById("upload-status-message").textContent = ""; document.getElementById("upload-status-message").textContent = "";
MainFileArray = new Array(); MainFileArray = new Array();
GlobalUploadSize = 0; GlobalUploadSize = 0;
@@ -1223,6 +1224,7 @@ class Uploads {
} }
} }
onDrop(event) { onDrop(event) {
console.log(event);
MainFileArray.push([]); MainFileArray.push([]);
document.getElementById("upload-hash").textContent = "ANALYZING UPLOAD DATA"; document.getElementById("upload-hash").textContent = "ANALYZING UPLOAD DATA";
document.getElementById("upload-confirm-button").style.visibility = "hidden"; document.getElementById("upload-confirm-button").style.visibility = "hidden";
@@ -1235,7 +1237,7 @@ class Uploads {
GlobalMainPathArray.push(GlobalUploadPath); GlobalMainPathArray.push(GlobalUploadPath);
} }
const dt = event.dataTransfer const dt = event.dataTransfer
const filesDropped = dt.files //const filesDropped = dt.files
const itemsDropped = dt.items const itemsDropped = dt.items
function readFileContents(file) { function readFileContents(file) {
@@ -1404,7 +1406,6 @@ class Uploads {
stopApplication() { stopApplication() {
EthoUploads.resetUploadProcess(); EthoUploads.resetUploadProcess();
EthoUploads.resetFileTable();
} }
@@ -1459,7 +1460,7 @@ $(document).on("render_uploads", function () {
}); });
$(document).on("drop", "#drag-container", function (event) { $(document).on("drop", "#drag-container", function (event) {
EthoUploads.onDrop(event); EthoUploads.onDrop(event.originalEvent);
}); });
$(document).on("dragleave", "#drag-container", function (event) { $(document).on("dragleave", "#drag-container", function (event) {
@@ -1562,7 +1563,12 @@ $(document).on("render_uploads", function () {
}); });
$(document).on("click", "#defaultModal-next", function (event) { $(document).on("click", "#defaultModal-next", function (event) {
$('#defaultModal2').iziModal(); $('#defaultModal2').iziModal({
onOpening: function () {
EthoUploads.resetFileTable();
}
});
$('#defaultModal2').iziModal('open'); $('#defaultModal2').iziModal('open');
$('#defaultModal').iziModal('close'); $('#defaultModal').iziModal('close');
EthoUploads.resetUploadProcess(); EthoUploads.resetUploadProcess();