From: joinsang <dhkq92@icloud.com>
Date: Fri, 29 Mar 2019 14:55:02 +0000 (+0900)
Subject: front page :: zippage noaddedfile error fix
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=829bae82ba485df2cfe4fda61f1b7d1c9771351c;p=ZipProject.git

front page :: zippage noaddedfile error fix
---

diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml
index b14e21c..3019ee3 100644
--- a/ZipProject/Views/Shared/_Layout.cshtml
+++ b/ZipProject/Views/Shared/_Layout.cshtml
@@ -51,7 +51,8 @@
     $.ajax({
       type: "get",
       url: "/Language/"+lang+".json",
-      async: false
+      async: false,
+      cache: false
     }).done(function(data){
       _Language= data
     });
diff --git a/ZipProject/_publish/ZipProject.Views.dll b/ZipProject/_publish/ZipProject.Views.dll
index 6da3caa..9366961 100644
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 497df2c..b932531 100644
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 a0b3c47..8bbb56b 100644
--- 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 bdbb916..9f6e97e 100644
--- 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 3b3813a..a330cc9 100644
--- 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 a0b3c47..8bbb56b 100644
--- 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 bdbb916..9f6e97e 100644
--- 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 b5be10a..a330cc9 100644
--- 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");
   }
 }