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

ethoFS Upload Modal Sequence Fix

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-16 20:54:39 -07:00
parent 3045dd050c
commit d983d097fc
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/templates/uploads.html
View File

@@ -280,8 +280,8 @@
</main> </main>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" id="defaultModal-close">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal2">NEXT</button> <button type="button" class="btn btn-link waves-effect" id="defaultModal-next">NEXT</button>
</div> </div>
</div> </div>
</div> </div>
@@ -324,8 +324,8 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" id="defaultModal2-close">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal3" id="confirm-files-button">NEXT</button> <button type="button" class="btn btn-link waves-effect" id="confirm-files-button">NEXT</button>
</div> </div>
</div> </div>
</div> </div>
@@ -390,8 +390,8 @@
</table> </table>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" id="defaultModal3-close">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="upload-confirm-button" data-target="#preparingUploadModal">CONFIRM</button> <button type="button" class="btn btn-link waves-effect" id="upload-confirm-button">CONFIRM</button>
</div> </div>
</main> </main>
</div> </div>

27
renderer/uploads.js
View File

@@ -899,8 +899,6 @@ class Uploads {
startUploadProcess() { startUploadProcess() {
console.log("Starting Upload Process.."); console.log("Starting Upload Process..");
$("#preparingUploadModal").iziModal();
$('#preparingUploadModal').iziModal('open');
var streamFinishCount = 0; var streamFinishCount = 0;
for (var i = 0; i < MainFileArray.length; i++) { for (var i = 0; i < MainFileArray.length; i++) {
const streamFiles = (files) => { const streamFiles = (files) => {
@@ -1436,15 +1434,40 @@ $(document).on("render_uploads", function () {
EthoUploads.resetUploadProcess(); EthoUploads.resetUploadProcess();
}); });
$(document).on("click", "#defaultModal-close", function (event) {
$('#defaultModal').iziModal('close');
});
$(document).on("click", "#defaultModal-next", function (event) {
$('#defaultModal2').iziModal();
$('#defaultModal2').iziModal('open');
$('#defaultModal').iziModal('close');
EthoUploads.resetUploadProcess();
});
$(document).on("click", "#defaultModal2-close", function (event) {
$('#defaultModal2').iziModal('close');
});
$(document).on("click", "#ethofs-registration-button", function (event) { $(document).on("click", "#ethofs-registration-button", function (event) {
EthoUploads.AddNewUser(document.getElementById('username').value); EthoUploads.AddNewUser(document.getElementById('username').value);
}); });
$(document).on("click", "#confirm-files-button", function (event) { $(document).on("click", "#confirm-files-button", function (event) {
$('#defaultModal3').iziModal();
$('#defaultModal3').iziModal('open');
$('#defaultModal2').iziModal('close');
EthoUploads.resetUploadModal(); EthoUploads.resetUploadModal();
}); });
$(document).on("click", "#defaultModal3-close", function (event) {
$('#defaultModal3').iziModal('close');
});
$(document).on("click", "#upload-confirm-button", function (event) { $(document).on("click", "#upload-confirm-button", function (event) {
$('#preparingUploadModal').iziModal();
$('#preparingUploadModal').iziModal('open');
$('#defaultModal3').iziModal('close');
EthoUploads.startUploadProcess(); EthoUploads.startUploadProcess();
}); });