if (per != (double) (e.BytesTransferred * 100 / e.TotalBytesToTransfer) / (double) 100) {
per = (double) (e.BytesTransferred * 100 / e.TotalBytesToTransfer) / (double) 100;
nows = Math.Truncate (nows) + per;
- SimpleLongPolling.Publish (uuid, nows + "");
+ try{
+ SimpleLongPolling.Publish (uuid, nows + "");
+ }
+ catch(InvalidOperationException ee){
+ ee.Data["result"]= "complate";
+ Console.WriteLine("error fix");
+ SimpleLongPolling.Publish(uuid, "-1");
+ }
}
}
}
\r
<script src="/static/js:Zip:Index.js" asp-append-version="true"></script>\r
\r
+ <script>\r
+ $(document).bind('keydown', function(e){\r
+ if (e.keyCode == 113 && selected_nameChange != undefined){\r
+ NameFormToggle();\r
+ }\r
+ });\r
+ </script>\r
<!-- #region 모바일 클릭, 더블클릭, 드래그(메뉴소환) 이벤트 -->\r
<script>\r
var bStartEvent= false;\r
<i class="fas fa-circle" style="color: rgb(70, 186, 33);"></i>\r
</div>\r
<div class="modal">\r
- <span>
@LanguagePack.GetText(lang, "pleasewait") <div><progress value="0" max="1"></progress></div></span>
\r+ <span>
<label>@LanguagePack.GetText(lang, "readyforcompress1")<br>@LanguagePack.GetText(lang, "readyforcompress2")</label><div><progress value="0" max="1"></progress></div></span>
\r </div>\r
<div class="webzip-btn-complate">\r
<div class="webzip-btn" onclick="$('.modal').css('display', 'table');RequestCompress();">\r
<directory>\r
<bullet is="zip"></bullet>\r
<label onmousedown="Clicked($(this))" key="0" id="zip_default">\r
- example\r
+ @LanguagePack.GetText(lang, "newzipfile")\r
</label>\r
<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;" />\r
<ul class="sort-disabled">\r
"renameZip": "Rename zipfile",
"usersguide": "User's Guide",
"guide1": "1. Click on the file to select it.",
- "guide2": "2. The file can be dragged into the folder. <br> ",
+ "guide2": "2. The file can be dragged into the folder.",
"guide3": "3. Folder is folded when double-clicked and opens when double-clicking again.",
"guide4": "4. Right-click contextmenu appears.",
"guide5": "5. For mobile users, the directory function is not possible, and the menu is dragged to the right.",
"complate": "Complate",
- "pleasewait": "Compressing files Please wait.",
+ "pleasewait": "Compressing files...",
+ "readyforcompress1": "We are preparing for compression, so please wait ...",
+ "readyforcompress2": "The larger the capacity, the longer it may take to prepare.",
"iscompress": "proceed with compression? FileSize: ",
"toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed.",
"nofilesadded": "No files added.",
"footIntroduce": "Easy and convenient file compression! Please find NiceZip.",
- "removefilefolder": "remove file,directory"
+ "removefilefolder": "remove file,directory",
+ "newzipfile": "New zipfile"
}
"guide4": "4. 우클릭시 메뉴가 나타납니다",
"guide5": "5. 모바일사용자는 디렉토리이동은 불가하며, 메뉴는 오른쪽으로 드래그하시면 나옵니다",
"complate": "완료",
- "pleasewait": "압축중입니다 잠시만 기다려주세요.",
+ "pleasewait": "압축중입니다...",
+ "readyforcompress1": "압축을 준비중이니 잠시 기다려주세요...",
+ "readyforcompress2": "용량이 많을수록 준비가 오래걸릴 수 있습니다",
"iscompress": "압축을 진행하시겠습니까? FileSize: ",
"toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다.",
"nofilesadded": "추가된 파일이 없습니다.",
"footIntroduce": "쉽고 편리한 압축! NiceZip을 찾아주세요.",
- "removefilefolder": "파일,폴더 제거"
+ "removefilefolder": "파일,폴더 제거",
+ "newzipfile": "새 압축파일"
}
success: function(data2) {
$("progress").attr("value", data2);
if (data2 != "-1") {
+ $(".modal span label").text(_Language["pleasewait"]);
Getprogress();
} else {
//modal display none바꾸고
+ $(".modal span label").html(_Language["readyforcompress1"]+"<br>"+_Language["readyforcompress2"]);
$(".modal").css("display", "none");
//파일다운로드 요청.
var a = document.createElement("a");
}
function ChangeInput($elem) {
- if ($elem.val() == "") {
+ input= $elem.val();
+ input= input.replace(/ /gi, " ");
+ input= input.replace(/ /gi, " ");
+ input= $.trim(input);
+ if (input == "") {
NotEmptyOrSame($elem.prev());
}
- if (isErrFileName($elem.val())) {
+ if (isErrFileName(input)) {
+ $elem.val("dir " + ++sameDir);
alert(_Language["err_violationFileName"]);
+ } else if (isTooLongFileName(input)) {
$elem.val("dir " + ++sameDir);
- } else if (isTooLongFileName($elem.val())) {
alert(_Language["err_tooLongFileName"]);
- $elem.val("dir " + ++sameDir);
} else {
- directories.put($elem.prev().attr("key"), $elem.val());
+ $elem.val(input);
+ directories.put($elem.prev().attr("key"), input);
}
- $elem.prev().text($elem.val());
+ $elem.prev().text(input);
$elem.css("display", "none");
$elem.prev().css("display", "");
}
//초기세팅(bullet, sort, 기본 zip label 세팅)
SetBulletIcon();
SetSortable();
-directories.put(0, "example");
+directories.put(0, _Language["newzipfile"]);
//웹소켓(안씀)
// var protocol = location.protocol === "https:" ? "wss:" : "ws:";
projects / ZipProject.git / commitdiff