From 02b6fa9ccef865b0ff14243cb180aae6bead8b1e Mon Sep 17 00:00:00 2001 From: fofolee Date: Tue, 24 Dec 2019 10:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BB=9A=E5=8A=A8=E6=9D=A1BU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 10244 -> 0 bytes assets/.DS_Store | Bin 6148 -> 0 bytes assets/index.js | 54 +++++++++++++++++++++++++++-------------------- docs/.DS_Store | Bin 6148 -> 0 bytes preload.js | 2 +- 5 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 .DS_Store delete mode 100644 assets/.DS_Store delete mode 100644 docs/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index f48b37bf27deb9d8d106da2fea29a6e5374be2da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeI1&ubGw6vy8tscu@u9E9R+FG7(ZNh(T_LQGSk2SJP|_^aJyV-ndPA=wx;jpX9V zi${N)yeWcb{{}A}^$+kr@G9tcW~bZ9Bo(DaLYWCWZ+7Or-JQ>ydAlRc1h1T=w|0E-V64kn92jv~oJ2Qt0{fJ~v9CzSc8KcvMfAd5ndB8eI#BQk}IObxNb zFvQBih|JMm6#An`M&@MjJL5Xy&W2c_7-HdJSX`ZqVkC9031|Y71lZa=MQ5o&Eee(O z`&+cV`o$ABjP=|`zETUkHmgngLl+`$^MZ2O>4i0-Z{Ks5$L+kp*|V+Pl&<+{iy0mv zo4WYbDWtCQY!}hKBt6@hZnfWSi+zaC)wbK}hPm8VBauwa9XV>I(`Nd(dAHIG`jyZQ zd)<=Vxy{d7PQ5D1*Mq=~%XalftKQ$toLme1&~Ewlj--C)X3KYiekthrPM2TjsvS0A z%Wt%qIW-t8=ki%Af4(rxT7!I{P{>*r&gF+g(_B2AU)|X99zPju51+nfT}D6?0gg^Y z=W+f9rLkVhUZB*wZM9wY#F=~iI%D>-H>S1A9-+BO`-hc|?*@JYE$o@ov_?I6E2Mxt zj3|$sai1BB(0VEPEJY4M}^b;E+@p#CT5{W zu0rgGG6PfOB8E077}rbKd+E&>*MoaE#v~M~<_;k+ZDSlNb2RZqA+-Q47x9mM5&5ur zfOlFz{y5*{s$w+{D;6=CH*Ab`Zl~CMP;An4jn?TBmFWuPls6`^uN*mknBpERMzimt zY4Q1w`ZMPJ!hy}I2{Otk07#uQ0Zl*?&;$g5WF#%N|G&QX|NokoCZGu%Vgg30Tq&2( z!JVxqwXbZi-NLbjgC(XniX=Bd#<$}k`F1=`*mgYITV%R9CRswcDC8)Ts6qPge+K;f b&YNEU|IPlSUjIkqIU3e9bq{w&*8jf&a~iT= diff --git a/assets/.DS_Store b/assets/.DS_Store deleted file mode 100644 index 6d635527afd15c0717a5ee2c08257113f1e78974..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5S~p!aS{QMiqvxR1&Kqb;uOK5suYEC=nWKp4uD!av52W_2is`~At)E# z0l^a>-h>NB9)t&gZ+}4kqlX?4s&=H^S+D1t+5Kj{>m?%ApN=e|77-aJT-O??N`$}X zr63j6a|N0SA4l|vCNv_Ol7hAF&{x=5rw|kj}G$t2y`ulZhi(XQ^?}tOj4;|R? zO=1V-#!n$=5jBDIDF)i6Ncbs3ea@i_@+iPQ;nM4}C~PBVzlM=KpegJlnrBDE-k)ac z%;Jd}{a0t=dvVg~d}ozv?ZVncqh2@amyG9waX1?!b~26ocJx#{c_Y_R?T2CL|7qLK zW6zx(w65L_gT(d%H%gg5d*TJ7aMll}!6+7f?%T;2SP|%;b#1ZO?pSTpy4_v2&4tzN zcH8EiTh?-E7#r8E-TlMk`J2Vt<-3oV5rkn+6~c3rmQQ%dFmf`80zV91pr2#b!Pcwa zY|%~H2FJWuD93{Nk{q!gK&CUhnenoPe0j*Pi(C(pg%DZyPxDu?bN(8LZNtkHHAfEN zDYv>R-*T8H;!JRsc+dgtOHtL`9I8=371nX}OAb>sm9Q8OSnFm5(ic{@?ri{XYxRPnrSEz`0_8)%FH^eN0K6t%b?) xv(`j8MB&2iR#FQHDs>!-20w~7QH0=~$s5o;rB_m;2cmxj1P!{<4E$3DegR6=3Pb<^ diff --git a/assets/index.js b/assets/index.js index 5dd8f277..be511b4b 100644 --- a/assets/index.js +++ b/assets/index.js @@ -97,8 +97,12 @@ highlightManual = (selector, text) => { // 初始化 scrollInit = () => { - $("html").niceScroll(); - $("#manual").niceScroll(); + $("html").niceScroll({ + enablekeyboard: false + }); + $("#manual").niceScroll({ + enablekeyboard: true + }); } // 向活动窗口发送文本 @@ -327,33 +331,37 @@ $(document).keydown(e => { break; // 上 case 38: - let pre = $(".select").prev(); - // 没有到达边界时移动选择条 - if(pre.length != 0){ - if(pre.offset().top < $(window).scrollTop()){ - $("html").animate({ scrollTop: "-=50" }, 0); + if ($('#manual').is(':hidden') && $("#mainlist").is(":visible")) { + let pre = $(".select").prev(); + // 没有到达边界时移动选择条 + if (pre.length != 0) { + if (pre.offset().top < $(window).scrollTop()) { + $("html").animate({ scrollTop: "-=50" }, 0); + } + pre.addClass("select"); + $(".select:last").removeClass("select"); + // 到达边界闪烁移动选择条 + } else { + $(".select").animate({ "opacity": "0.3" }).delay(500).animate({ "opacity": "1" }) } - pre.addClass("select"); - $(".select:last").removeClass("select"); - // 到达边界闪烁移动选择条 - }else{ - $(".select").animate({"opacity":"0.3"}).delay(500).animate({"opacity":"1"}) } break; // 下 case 40: - let next = $(".select").next(); - // 没有到达边界时移动选择条 - if(next.length !=0){ - if(next.offset().top >= $(window).scrollTop() + 550){ - $("html").animate({ scrollTop: "+=50" }, 0); + if ($('#manual').is(':hidden') && $("#mainlist").is(":visible")) { + let next = $(".select").next(); + // 没有到达边界时移动选择条 + if (next.length != 0) { + if (next.offset().top >= $(window).scrollTop() + 550) { + $("html").animate({ scrollTop: "+=50" }, 0); + } + loadList(300); + next.addClass("select"); + $(".select:first").removeClass("select"); + // 到达边界闪烁移动选择条 + } else { + $(".select").animate({ "opacity": "0.3" }).delay(500).animate({ "opacity": "1" }) } - loadList(300); - next.addClass("select"); - $(".select:first").removeClass("select"); - // 到达边界闪烁移动选择条 - }else{ - $(".select").animate({"opacity":"0.3"}).delay(500).animate({"opacity":"1"}) } break; } diff --git a/docs/.DS_Store b/docs/.DS_Store deleted file mode 100644 index d1c9da1c4eb4e9e1afc3094f2ae07a9dbf8fddab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Z}496uoZRAsvLM1k%7R8zdH8H03c1G*VT{Vk8!WieLd~nlx1#NaN6^Q%Wi7 zhJQft1&BXk!xBD#KVZiOjvqjicDBq2`BwI^eb2R>V<)bOh&3mHOH?5u8%bbs8`%aE zev#I!pj$2gndpQ2D2c9aX^#P;fKlKyE1=%p?ta9(ew2BCul|%KC%;7jaq7}D>d`32 z{Q$-)*P=d!lxA6MXEV#6juSoZCqIe8aayZ=VFjyL+B##G%Xayk{iHqM({}2mlX24< zJ(9IB==r*QpY!NX+4CQSz3E});%y$MUKsaAEA+x-&0ckA_f)!Du7E*7@EbH&};?+j-z=dTv8->C&<_~uDFukkm$M?tG_ z)E>nVkNap5>}`5V9vvZ#q2>rWC2LB(0dG~$EyUcTiBO(qIaR;sxFw3vXAJg>EVJO{ zm=;DJP?BSP-pq>nZoA8e3B1JY;tzn1AM#c!n512zuit8Sh5xT7IL4CYY*P68VQ&w=FTb3aX;p`7F2#tQI;jorni~BJwbmQzlg>;uGrhFTnlR# z(lE=Cdppm zmWHyp0EiezV?*OoAv`dqLV+rj=_>|P;b?a>uc2|NP=yoImk*{#X8MN0d8kY*u0yBREqzooA3j9+AegPbA|GfYJ diff --git a/preload.js b/preload.js index a0f4954d..0ec1eb50 100644 --- a/preload.js +++ b/preload.js @@ -28,7 +28,7 @@ dirname = __dirname; isWin = process.platform == 'win32' ? true : false; openFolder = () => { - return dialog.showOpenDialog(BrowserWindow.getFocusedWindow(), { + return dialog.showOpenDialogSync(BrowserWindow.getFocusedWindow(), { buttonLabel: '选择', properties: ['openDirectory'] });