From 7bfceea7d54322aaf8a713b271c998cafd0c9197 Mon Sep 17 00:00:00 2001 From: Piyush Mishra Date: Wed, 26 May 2021 09:24:13 +0530 Subject: [PATCH] error on too long compressing time --- static/js/images.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/static/js/images.js b/static/js/images.js index d2dab5f..7f85c8e 100644 --- a/static/js/images.js +++ b/static/js/images.js @@ -12,19 +12,24 @@ let Images = class { } static compressImage(file, qual, mime) { - new Compressor(file, { + var compressor = null; + var sendingTimeout = setTimeout(function() { + compressor.abort(); + }, 5000); + compressor = new Compressor(file, { quality: qual, width: 320, mimeType: mime, success(result) { + clearTimeout(sendingTimeout); var reader = new FileReader(); reader.readAsDataURL(result); reader.onloadend = function() { var base64data = reader.result; - console.log('a') if(base64data.length > 63488 && mime != 'image/jpeg') { base64data = null; result = null; + compressor = null; Images.compressImage(file, 0.7, 'image/jpeg'); return; } else if(base64data.length > 63488 && mime == 'image/jpeg') { @@ -42,6 +47,15 @@ let Images = class { $('#progress_clip').addClass('is-hidden'); } }, + error(err) { + clearTimeout(sendingTimeout); + $('#progress_clip').addClass('is-hidden'); + var prop = { + title: 'Warning', + text: "Failed to send image. Taking too long to compress.", + check: false + }; dialog(prop, function() {}); + }, }); } } \ No newline at end of file