From 657206f4e6e902684f226226777d01173ad80bb8 Mon Sep 17 00:00:00 2001 From: joinsang Date: Mon, 18 Mar 2019 20:01:20 +0900 Subject: [PATCH] =?utf8?q?=EC=A4=91=EB=B3=B5=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?utf8?q?=EB=93=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ZipProject/_publish/wwwroot/js/Zip/partial_zip.js | 7 ++++--- ZipProject/wwwroot/js/Zip/partial_zip.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js index f29a6a0..3ec8057 100644 --- a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js +++ b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js @@ -349,12 +349,13 @@ function RequestCompress() { }); var progress = setInterval(() => { - var req= $.ajax({ + $.ajax({ type: "post", url: "/webzip/fileuploadprogress", data: "uuid="+uuid }).done(function(data2) { - if (data2 == "-1"){ + var iscomplate = false; + if (data2 == "-1" && iscomplate == false){ clearInterval(progress); $(".modal").css("display", "none"); var a = document.createElement("a"); @@ -363,8 +364,8 @@ function RequestCompress() { a.download = directories.get(0) + "." + format; a.click(); window.URL.revokeObjectURL(url); - req.abort(); $("progress").attr("value", "0"); + iscomplate == true; } else { if (data2 != "-2"){ diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js index f29a6a0..3ec8057 100644 --- a/ZipProject/wwwroot/js/Zip/partial_zip.js +++ b/ZipProject/wwwroot/js/Zip/partial_zip.js @@ -349,12 +349,13 @@ function RequestCompress() { }); var progress = setInterval(() => { - var req= $.ajax({ + $.ajax({ type: "post", url: "/webzip/fileuploadprogress", data: "uuid="+uuid }).done(function(data2) { - if (data2 == "-1"){ + var iscomplate = false; + if (data2 == "-1" && iscomplate == false){ clearInterval(progress); $(".modal").css("display", "none"); var a = document.createElement("a"); @@ -363,8 +364,8 @@ function RequestCompress() { a.download = directories.get(0) + "." + format; a.click(); window.URL.revokeObjectURL(url); - req.abort(); $("progress").attr("value", "0"); + iscomplate == true; } else { if (data2 != "-2"){ -- 2.43.0