front page :: zippage noaddedfile error fix

diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml
index b14e21c64e9631442fec7c2e28d3c29e002bd0e8..3019ee374bb32ab9a126d927f2e87bec058ed0f1 100644 (file)
--- a/ZipProject/Views/Shared/_Layout.cshtml
+++ b/ZipProject/Views/Shared/_Layout.cshtml
@@ -51,7 +51,8 @@
     $.ajax({\r
       type: "get",\r
       url: "/Language/"+lang+".json",\r
-      async: false\r
+      async: false,\r
+      cache: false\r
     }).done(function(data){\r
       _Language= data\r
     });\r

diff --git a/ZipProject/_publish/ZipProject.Views.dll b/ZipProject/_publish/ZipProject.Views.dll
index 6da3caa5a2f2dbf316a7a4dc24d3ff3b3264fafb..9366961f0b1e3ab0a4247ae2973ce42c02617ff6 100644 (file)
Binary files a/ZipProject/_publish/ZipProject.Views.dll and b/ZipProject/_publish/ZipProject.Views.dll differ

diff --git a/ZipProject/_publish/ZipProject.Views.pdb b/ZipProject/_publish/ZipProject.Views.pdb
index 497df2cc72a9dfec25be90b683b2694937c43e8f..b932531a73c20e44c4fdd22703aa35eeb09740a1 100644 (file)
Binary files a/ZipProject/_publish/ZipProject.Views.pdb and b/ZipProject/_publish/ZipProject.Views.pdb differ

diff --git a/ZipProject/_publish/wwwroot/Language/en.json b/ZipProject/_publish/wwwroot/Language/en.json
index a0b3c472ea7021201c891c2163739c539fbd2006..8bbb56b4d66bbb28b51b6593aeb572861864246c 100644 (file)
--- a/ZipProject/_publish/wwwroot/Language/en.json
+++ b/ZipProject/_publish/wwwroot/Language/en.json
@@ -29,5 +29,6 @@
   "complate": "Complate",
   "pleasewait": "Compressing files Please wait.",
   "iscompress": "proceed with compression? FileSize: ",
-  "toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed."
+  "toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed.",
+  "nofilesadded": "No files added."
 }

diff --git a/ZipProject/_publish/wwwroot/Language/kr.json b/ZipProject/_publish/wwwroot/Language/kr.json
index bdbb9167ac95c0a57ace5c52e93ee972615ca9a5..9f6e97e162c9ce87e1c88c5930e264c2fb86a162 100644 (file)
--- a/ZipProject/_publish/wwwroot/Language/kr.json
+++ b/ZipProject/_publish/wwwroot/Language/kr.json
@@ -29,5 +29,6 @@
   "complate": "완료",
   "pleasewait": "압축중입니다 잠시만 기다려주세요.",
   "iscompress": "압축을 진행하시겠습니까? FileSize: ",
-  "toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다."
+  "toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다.",
+  "nofilesadded": "추가된 파일이 없습니다."
 }

diff --git a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js
index 3b3813a1010fcf17c00cf7aa83d5323d83c863f7..a330cc9fb84b9f270109d06fe5528a2386766978 100644 (file)
--- a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js
@@ -292,11 +292,15 @@ function isTooLongFileName(val) {
 
 //압축 시작(백단에 파일들과 파일정보 map 전송)
 function RequestCompress() {
+  if (parseInt(filesSize, 10) === 0) {
+    alert(_Language["nofilesadded"]);
+    $(".modal").css("display", "none");
+    return false;
+  }
   var size = (filesSize / 1024 / 1024).toFixed(2) + "MB";
   if (filesSize > maxFileSize / 2) {
     size = (filesSize / 1024 / 1024 / 1024).toFixed(1) + "GB";
   }
-  size = 100;
   var format = "zip";
 
   if (filesSize > maxFileSize) {
@@ -374,6 +378,8 @@ function RequestCompress() {
     };
 
     Getprogress();
+  } else {
+    $(".modal").css("display", "none");
   }
 }
 

diff --git a/ZipProject/wwwroot/Language/en.json b/ZipProject/wwwroot/Language/en.json
index a0b3c472ea7021201c891c2163739c539fbd2006..8bbb56b4d66bbb28b51b6593aeb572861864246c 100644 (file)
--- a/ZipProject/wwwroot/Language/en.json
+++ b/ZipProject/wwwroot/Language/en.json
@@ -29,5 +29,6 @@
   "complate": "Complate",
   "pleasewait": "Compressing files Please wait.",
   "iscompress": "proceed with compression? FileSize: ",
-  "toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed."
+  "toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed.",
+  "nofilesadded": "No files added."
 }

diff --git a/ZipProject/wwwroot/Language/kr.json b/ZipProject/wwwroot/Language/kr.json
index bdbb9167ac95c0a57ace5c52e93ee972615ca9a5..9f6e97e162c9ce87e1c88c5930e264c2fb86a162 100644 (file)
--- a/ZipProject/wwwroot/Language/kr.json
+++ b/ZipProject/wwwroot/Language/kr.json
@@ -29,5 +29,6 @@
   "complate": "완료",
   "pleasewait": "압축중입니다 잠시만 기다려주세요.",
   "iscompress": "압축을 진행하시겠습니까? FileSize: ",
-  "toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다."
+  "toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다.",
+  "nofilesadded": "추가된 파일이 없습니다."
 }

diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index b5be10a2876c536605edb362e93db4c8f6b5a146..a330cc9fb84b9f270109d06fe5528a2386766978 100644 (file)
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -292,6 +292,11 @@ function isTooLongFileName(val) {
 
 //압축 시작(백단에 파일들과 파일정보 map 전송)
 function RequestCompress() {
+  if (parseInt(filesSize, 10) === 0) {
+    alert(_Language["nofilesadded"]);
+    $(".modal").css("display", "none");
+    return false;
+  }
   var size = (filesSize / 1024 / 1024).toFixed(2) + "MB";
   if (filesSize > maxFileSize / 2) {
     size = (filesSize / 1024 / 1024 / 1024).toFixed(1) + "GB";
@@ -373,6 +378,8 @@ function RequestCompress() {
     };
 
     Getprogress();
+  } else {
+    $(".modal").css("display", "none");
   }
 }