From 207c2ea160f992ce1aadbe53d79958fba1f9d23c Mon Sep 17 00:00:00 2001
From: jocloud <dhkq92@icloud.com>
Date: Mon, 25 May 2020 02:40:29 +0000
Subject: [PATCH] =?utf8?q?=EA=B5=AC=EA=B8=80=EC=AA=BD=20=EB=B0=98=EC=98=81?=
 =?utf8?q?=EB=90=98=EB=8A=94=20seo=20=ED=83=9C=EA=B7=B8=20=EC=88=98?=
 =?utf8?q?=EC=A0=95,=20=ED=8C=8C=EC=9D=BCinput=20=EC=A3=BC=EC=84=9D?=
 =?utf8?q?=EC=B2=98=EB=A6=AC=EB=90=98=EC=96=B4=EC=9E=88=EB=8D=98=EA=B2=83?=
 =?utf8?q?=20=ED=95=B4=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ZipProject/Views/Shared/_Layout.cshtml     |  2 +-
 ZipProject/Views/WebZip/partial_zip.cshtml |  8 ++---
 ZipProject/wwwroot/js/Zip/partial_zip.js   | 40 +++++++++++++++-------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml
index 2582faf..6dfaf91 100644
--- a/ZipProject/Views/Shared/_Layout.cshtml
+++ b/ZipProject/Views/Shared/_Layout.cshtml
@@ -8,7 +8,7 @@
   <meta name="keywords" content="filecompress,compress,zip,easyzip,zipfile,easycompress,온라인파일압축,온라인,파일압축사이트,나이스집,파일압축,온라인압축"> 
   <meta name="og:url" content="https://nicezip.wabiey.com">
   <meta name="og:url" content="https://wabiey.com">
-  <meta name="og:title" content="NiceZip: Easily file compression!">
+  <meta name="og:title" content="나이스집:: 온라인 파일압축사이트 설치가 필요 없으며 브라우저 자체에서 작동합니다">
   <meta name="og:description" content="온라인 파일압축사이트 설치가 필요 없으며 브라우저 자체에서 작동합니다. Compress Zip files online.">
   <meta name="og:site_name" content="nicezip">
   <link rel="canonical" href="https://nicezip.wabiey.com">
diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index a85494e..272c5bf 100644
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -24,10 +24,10 @@
   }
 </style>
 
-<div class="col-sm-5 webzip-section-sidezip" style="display: none;">
-
   <input type="file" id="btn_chooseDirectory" name="chooseDirectory" style="display: none;" multiple webkitdirectory directory onclick="alert(_Language['comingsoon']); return false;" />
   <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple onchange="AddFile($(this))" onclick="$(this).val(null)" />
+@* <div class="col-sm-5 webzip-section-sidezip" style="display: none;">
+
 
   <!-- Section Set Option -->
   <table class="table table-hover">
@@ -64,7 +64,7 @@
       </td>
     </tr>
   </table>
-</div>
+</div> *@
 <div class="col-sm-12 webzip-section-sidezip webzip-section-explore" id="zipExplore"
      style="border: 0px solid lightgray; overflow-x: auto; white-space: nowrap; text-align: left; padding: 0; background-color: #f9f9f9f9;
      border-radius: 10px;">
@@ -90,7 +90,7 @@
     <label onmousedown="Clicked($(this))" key="0" id="zip_default">
       @LanguagePack.GetText(lang, "newzipfile")
     </label>
-    <input type="text" value="example" onkeypress="ChangeKeypress($(this));" style="display:none; line-height:1" onblur="ChangeInput($(this));" onfocus="var a= this.value;this.value= null;this.value= a;" />
+    <input type="text" value='@LanguagePack.GetText(lang, "newzipfile")' onkeypress="ChangeKeypress($(this));" style="display:none; line-height:1" onblur="ChangeInput($(this));" onfocus="var a= this.value;this.value= null;this.value= a;" />
     <ul class="sort-disabled">
       <li class="webzip-explore-liEmpty">&nbsp;</li>
       <li><dir style="display: none;"></dir></li>
diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index b1ff912..b666529 100644
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -15,7 +15,7 @@ var maxFileSize = 2148532224; // byte from 2gb
 function NotEmptyOrSame($elem) {
   var aCount = 0;
   for (var i = 0; i < directories.keys().length; i++) {
-    if (directories.get(i) == $elem.val()) {
+    if (directories.get(i) == $elem.next().val()) {
       aCount++;
     }
   }
@@ -25,7 +25,7 @@ function NotEmptyOrSame($elem) {
     $elem.focus();
     return false;
   }
-  if ($elem.val() == "") {
+  if ($elem.next().val() == "") {
     alert(_Language["emptyDirectory"]);
     $elem.next().val("dir " + ++sameDir);
     $elem.focus();
@@ -388,7 +388,8 @@ function RequestCompress() {
 
 function ChangeKeypress($elem) {
   if (event.keyCode == 13) {
-    ChangeInput($elem);
+    // ChangeInput($elem);
+    $elem.blur();
   }
 }
 
@@ -397,20 +398,33 @@ function ChangeInput($elem) {
   input= input.replace(/  /gi, " ");
   input= input.replace(/　/gi, " ");
   input= $.trim(input);
+  for (var i=0; i<directories.values().length; i++){
+    console.log(input, directories.get(i))
+    if ($elem.prev().attr("key") == i)
+      break;
+    if (input == directories.get(i))
+      NotEmptyOrSame($elem.prev());
+  }
   if (input == "") {
     NotEmptyOrSame($elem.prev());
   }
-  if (isErrFileName(input)) {
-    $elem.val("dir " + ++sameDir);
-    alert(_Language["err_violationFileName"]);
-  } else if (isTooLongFileName(input)) {
-    $elem.val("dir " + ++sameDir);
-    alert(_Language["err_tooLongFileName"]);
-  } else {
-    $elem.val(input);
-    directories.put($elem.prev().attr("key"), input);
+  else {
+    if (isErrFileName(input)) {
+      $elem.val("dir " + (parseInt(sameDir)+1));
+      $elem.prev().text("dir " + (parseInt(sameDir)+1))
+      directories.put($elem.prev().attr("key"), "dir " + (parseInt(sameDir)+1));
+      alert(_Language["err_violationFileName"]);
+    } else if (isTooLongFileName(input)) {
+      $elem.val("dir " + (parseInt(sameDir)+1));
+      $elem.prev().text("dir " + (parseInt(sameDir)+1));
+      directories.put($elem.prev().attr("key"), "dir " + (parseInt(sameDir)+1));
+      alert(_Language["err_tooLongFileName"]);
+    } else {
+      $elem.val(input);
+      $elem.prev().text(input);
+      directories.put($elem.prev().attr("key"), input);
+    }
   }
-  $elem.prev().text(input);
   $elem.css("display", "none");
   $elem.prev().css("display", "");
 }
-- 
2.43.0