From 829bae82ba485df2cfe4fda61f1b7d1c9771351c Mon Sep 17 00:00:00 2001 From: joinsang Date: Fri, 29 Mar 2019 23:55:02 +0900 Subject: [PATCH] front page :: zippage noaddedfile error fix --- ZipProject/Views/Shared/_Layout.cshtml | 3 ++- ZipProject/_publish/ZipProject.Views.dll | Bin 70656 -> 70656 bytes ZipProject/_publish/ZipProject.Views.pdb | Bin 5436 -> 5436 bytes ZipProject/_publish/wwwroot/Language/en.json | 3 ++- ZipProject/_publish/wwwroot/Language/kr.json | 3 ++- .../_publish/wwwroot/js/Zip/partial_zip.js | 8 +++++++- ZipProject/wwwroot/Language/en.json | 3 ++- ZipProject/wwwroot/Language/kr.json | 3 ++- ZipProject/wwwroot/js/Zip/partial_zip.js | 7 +++++++ 9 files changed, 24 insertions(+), 6 deletions(-) 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 6da3caa5a2f2dbf316a7a4dc24d3ff3b3264fafb..9366961f0b1e3ab0a4247ae2973ce42c02617ff6 100644 GIT binary patch delta 2852 zcmZ`*e{7Uz9e=)W3&*fM+I5uDkzS9xwFL^?z3<(<_i`yc$|w|N6d1M)rrb}bZtJ`R zomN-IHUk+>>O;ht1xzpolGT~KPH@A_#l^W`V2ei0GPGNWe{8|uiJK*DBz>7&c!p6Rn=;m|5k+Z8@}QFk{?N86hA zi)zBTaU}#gYW3?q(kuJ*qcSBqEmqsSyML^doY>GTu0LwIt+K^G+%_tW1$gPf>{6?{ zpQ#d)6hniE}4icwJ=n>-mM;*xP#k?9=^K|QQg@ds6%~A zm6~6(qw1k0wIToY6$fPM85nfd-5-bMCimCrK2%pfHCNr%40Tf-ePRbfPUJomJwkn~ z?!I{W9Q2`P)$xC_yVrkf)uim)2Y_XD|5J1QON5Wq!`Eh@Z|~bVH;F^A`d@|q+0`SK z{6znKZ9Mc&4~cl!?@AmI>DOnHT~@45{~{S{>skS*T0h>_D4=JtLJl~hpGNvez~02ujN2jrdlT>vfKW(1MpR#~N!!x6cpcMSKS{)dNG%4Prb@E*%* z9n;sh+%8c)3kKJWG>NNoBg^DdI4{-@jD+QY{_;pfPVv0x*SNlsa6O+H{ZnWzLKBM~ z7@Lz@7n>XZZ`D@}p0|~FTee2zJ#+pF&L8NbTd!J6#{Jqy&o@}T?Wbgy z|Jl(aR_FcWO2u~XQtzKqss$OuHt!y}6W{qR9RJ38GNU3 zN~!|R9-fS2G}Y{rOXjlYp-SMH%9h@p6oR3dkNJl;B%5R<^OMDjQY_gUu{lJY|z{ z5&9y0N{j_*3a6sUFAWLnOu{dS$;@0!RrCda#Z&=~X_$Kk%tHXj6qbUl3|SG93f={L zr%^%0q{=iZu*iUnvLP}7TMu@87?PMQf;CsMv+=f#e;KJT25C)M%GK2$#-=iWB52ka z5}<7APQkEZH0%w##VW{*i*pI~X#i)D1}y_d*aue1K9koh?8r_QfoW5O2T>Eomq_*$ z%+&@aP%uQ5;oukt4~Y=Mg)x(JOx|p>jUCTy0Chyjz^(*cFl0=e&88cU*;Oe*9T zvj8326Dj}#l=)9R|4WfS=)LFuczeHURtr`4hn^C$E2;Zb#kbGL8V1Q2;gVRa$ibPx z3CyWsx||6nlfa(L1&h<`>EkcXdTc*gCzn<1Dp;Hy4uyw32Y}})Jeh13Xyml$&s-R7 z9B?7x2nMa-jL6044}7m%r}idDbAQ;oS_z&_&D=9vhClpIJQY z9m(dMVnFsVxHGs5`jMZl#ohKGr3ZbO1esx;4zPIX*dopZE!j*LZ(c~&TSen|b69Oq zGiQqF2aRLM&MQZre^YD=cY4h$FIt1aL5J|kAwzU8o45T5>6c4BFs7ZbPVod6{Qu-K7$>nkOiYf`Y)G`4U()f{5Xv) zp2@OshGBy#VHc$88d$cT zmtTGL1HI-)?f&Q+--sY1-g*upZy4Q~e=uwuLSAGB;~0{5)Zg7`JtBSW4qsU{bPT7p}ntSC#y-iH8`5xH3h;TYk9>36+Wse7!pndA*joI)t$#+i@1BmfOYX#i YX8HZOa9IA;VC~DDYsJr0nNEcM10|3`yZ`_I delta 2863 zcmZ`*d2AF_7=Pb%VGC&&+rm;Ruszn&Lb0>6v&XR3E>}wnNC9odE6g7KLnW=N7_@4u zC_*G^^GJ%uNE9^?QKL_7y)hcmctJE#i3dcDi3CJNQG@9Bo9U`Fv6Gp3?>m0q?>pXX z2X=V|c6sjI>^WF*%f7*_)5#dz-R1jgHi;F2|B@swEEudRD_TpUi1(k@vp`m94RQ_5 zqPV=3`l(EkRyMBT1tDn2E~c33&|)PNR-4N@$g_;SWOIC)R(XLsIr&ne4QjRjzEV0U zkJjy;cOh#7)28+Wg_!8geOxJed(OeKrxwr3bx>FMUA4Dvnh@i2g;k<=YOY-EuU}97 zcd|i6-u)8RoZ)xMpFLV81#cCv(p=$Oq%V&)t&&gZljK3`7)_S%%nNFN>A;f(i4yY4DT$!wHyy!> zgpaD_6^U8iD@~+xo!XlCi0FB_wkaQJp}ec9OFPz}zG=FYO7DoAS>W78xw82_Qu0Xi zHd-JDl0i0=k0q<=Zuw4fHod4$Bo7c>BHvnY5BXK+!W*gjRP;=Y%GU}w&Dzl>73NMh zIo!rCE};psd~rb2la65dVjm^tWh{8Z5rl6WCq!ixJLfBOAUOv4k-{^O{jCnrr;J=D zzh|H$%N#+VrG!X^S_1TlT-j2~`EO{MO^>RbEo(IGyH0s}$=TY;PBtx*=e8A5u}rj0 zrzUx*ZHipi=A)(ZrnUgB$9~ese0~GIJfV$pFKZrRO-M>xHmrD%CdqeK?4WveRmT>sV$sDy)LgV$?B5~8 zS#{64fp`Bv|_xZf0pNDEzNJw#c$B#p^8JDYg>x!4MhgEHT(S#vDQjz)zER z7Ox|WU^51EwxiYAHXZuB#2lcmEW5?eGWcs*%YB&2i?3l9-Gdajvw3f?-AqV3pw;qY&pCmKbxiJtd;@ z)t3%gC?f_Mj5Dms^4@eTO^0*Hp@6O;bDcFIzSv8B@^Xh~2?A&N0w}~510ewnN|=Ey z=k1P&&UP3G_=H%K=DisB#7Z#44UWH`Dz-zbbbzH#=#$bv%fZk5>Y6tn)|vqxb^;=ZJ8}lEOs1A{fnmjA_wFw2JVs_kC#i|chlve zeL;EshvouMLCLccNY_%h)X;v0lcM_7VZ&D*az38vAvu4J~TA^4v6S7Rx2xqgA zR4A1)>}VunrmSe%PQ}cyEtmf>V|aK1t<Dg8i$y7zBQY+e5V diff --git a/ZipProject/_publish/ZipProject.Views.pdb b/ZipProject/_publish/ZipProject.Views.pdb index 497df2cc72a9dfec25be90b683b2694937c43e8f..b932531a73c20e44c4fdd22703aa35eeb09740a1 100644 GIT binary patch delta 64 zcmV-G0KfmdD!eL?d=zMt4;pp^&rYykx*2iA&VhIS3x% 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"); } } -- 2.43.0