From: joinsang <dhkq92@icloud.com>
Date: Sun, 17 Feb 2019 10:28:45 +0000 (+0900)
Subject: merge test
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=73595371170233d557156300d94e0577ad1f24fa;p=ZipProject.git

merge test
---

diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index 38c8271..b47eee7 100644
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -53,14 +53,17 @@
     </tr>
     <tr>
       <td colspan="2">
+        <label class="btn btn-danger webzip-btn-choosefile" for="btn_chooseDirectory">
+          @LanguagePack.GetText(lang, "addDirectory")
+        </label>
         <label class="btn btn-danger webzip-btn-choosefile" for="btn_chooseFiles">
           @LanguagePack.GetText(lang, "addFile")
         </label>
         <label class="btn btn-danger webzip-btn-choosefile" for="btn_newDirectory">
           @LanguagePack.GetText(lang, "newFolder")
         </label>
-        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple 
-                onchange="AddFile($(this))" />
+        <input type="file" id="btn_chooseDirectory" name="chooseDirectory" style="display: none;" multiple webkitdirectory directory />
+        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple onchange="AddFile($(this))" />
         <input type="button" class="btn-danger" onclick="AddFolder()" style="display: none;" id="btn_newDirectory" />
       </td>
     </tr>
diff --git a/ZipProject/wwwroot/Language/en.json b/ZipProject/wwwroot/Language/en.json
index d936312..0a2519c 100644
--- a/ZipProject/wwwroot/Language/en.json
+++ b/ZipProject/wwwroot/Language/en.json
@@ -10,5 +10,6 @@
   "err_tooLongFileName": "File and diretory name is too long",
   "newFolder": "New directory",
   "emptyDirectory": "The directory name can not be empty.",
-  "duplicateName": "It can not have the same name as a file already added:"
+  "duplicateName": "It can not have the same name as a file already added:",
+  "addDirectory": "Add Directory"
 }
diff --git a/ZipProject/wwwroot/Language/kr.json b/ZipProject/wwwroot/Language/kr.json
index 114f234..0ee9afb 100644
--- a/ZipProject/wwwroot/Language/kr.json
+++ b/ZipProject/wwwroot/Language/kr.json
@@ -10,5 +10,6 @@
   "err_tooLongFileName": "파일 또는 폴더명이 너무 깁니다",
   "newFolder": "새 폴더",
   "emptyDirectory": "폴더명은 비워둘수 없습니다",
-  "duplicateName": "이미 추가되어있는 파일과 이름이 같을수 없습니다 : "
+  "duplicateName": "이미 추가되어있는 파일과 이름이 같을수 없습니다 : ",
+  "addDirectory": "폴더추가"
 }
diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index c683cd4..a82f1bd 100644
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -95,10 +95,12 @@ function SetSortable() {
           .text()
           .trim();
 
-        if (true) {
+        if (directory_name != directories.get(0)) {
           console.log(
             "directory: " + directory_name + ", file name: " + directory_infiles
           );
+        } else {
+          "directory: " + directory_name + ", file name: " + directory_infiles;
         }
       }
     })