merge test

diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index 38c8271e0d1672616f3960c59acc0c2f926e55cb..b47eee7350df129df7c776350c5b3248c34d4957 100644 (file)
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -53,14 +53,17 @@
     </tr>\r
     <tr>\r
       <td colspan="2">\r
+        <label class="btn btn-danger webzip-btn-choosefile" for="btn_chooseDirectory">\r
+          @LanguagePack.GetText(lang, "addDirectory")\r
+        </label>\r
         <label class="btn btn-danger webzip-btn-choosefile" for="btn_chooseFiles">\r
           @LanguagePack.GetText(lang, "addFile")\r
         </label>\r
         <label class="btn btn-danger webzip-btn-choosefile" for="btn_newDirectory">\r
           @LanguagePack.GetText(lang, "newFolder")\r
         </label>\r
-        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple \r
-                onchange="AddFile($(this))" />\r
+        <input type="file" id="btn_chooseDirectory" name="chooseDirectory" style="display: none;" multiple webkitdirectory directory />\r
+        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple onchange="AddFile($(this))" />\r
         <input type="button" class="btn-danger" onclick="AddFolder()" style="display: none;" id="btn_newDirectory" />\r
       </td>\r
     </tr>\r

diff --git a/ZipProject/wwwroot/Language/en.json b/ZipProject/wwwroot/Language/en.json
index d9363123c40430fbd074ba7f406575f5bdd6bfe4..0a2519cb6ad7678c9854123e33185a031b64fc7d 100644 (file)
--- 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 114f23457400aaa6c48d5ad9df6a71b69352f86c..0ee9afb55926519f23df23d6d8cd75740c43a177 100644 (file)
--- 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 c683cd48193a05f66c4be3dcdcae065dc2dd9c35..a82f1bdd1fb11711c824b12609d8597944d1709c 100644 (file)
--- 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;
         }
       }
     })