From 402d8aeb34a9091b811347f26b4d9872c39a44a3 Mon Sep 17 00:00:00 2001 From: LeeWannacott Date: Fri, 15 Mar 2024 23:36:53 +1300 Subject: [PATCH] Version 1.20.0 --- browser-extensions/chrome/table-sort-js.zip | Bin 8118 -> 8117 bytes browser-extensions/chrome/table-sort.js | 19 ++++++++++--------- browser-extensions/firefox/table-sort-js.zip | Bin 8118 -> 8117 bytes browser-extensions/firefox/table-sort.js | 19 ++++++++++--------- npm/table-sort.js | 19 ++++++++++--------- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/browser-extensions/chrome/table-sort-js.zip b/browser-extensions/chrome/table-sort-js.zip index 58245c0368c5ea50ac449d27625287e397a68e55..cab2ee6aef3fdb9085e01116ef9948bc74b15b65 100644 GIT binary patch delta 5099 zcmVsr7o6z9`~HVFQu5w}}^ zvCVL=PPiPKoy8Ed zGJgLM;}TGjnC-yXF=;yQzESxWHA5JDiQng)k9Q6HLjCc(RPX-W0-1R&+0!?xq!`T$a z;s;Pm0|XQR000O8hP-cB?}ODj#uESl7n2MM83UUn^phwGDGw;yD#>2&`p&XlD_u4h znv-A(IvnYWEy`+4-cU+@jf*0lm5g=Xq%&H~=$M?pz9f^j3cCi&^Eae(29tLSG64dU zstZ03FW}{0>K>ytON;AE{pf;|_X{t7Wh`0%0(;FCIV>S3ns@{#KV}p!>$5c=zm0Q{ zHRrqAm*C?jf7|hnIbucGsw&9D;%bU-Hl2=Q*m(ymd!0MhfU`1N<;CkFpYBeP&J*kRAMjXwGQdkMdPcNfC4 zDrdB=X(END+9ceNvJd7ZE;qef~%O#BN7mGCW7>}y*rk)&5C7$~Z#7Qf5MnRdh=aC$Eu=BL4 z8E>F}+z=txJwTn6NeX5Z6df9WgG;i-qD4QWj272yL7qK(Mh=Z~cT(1|1a3C@j}@)f z7c`?Ym~Bq844S(tleKB?IT@M82pJARF~twyYdH>~`I4;(#{usXa~DLeP{y>9yww_6 z4#%B17#Ah$jSIFom~kZ@_4{4jj}4*Vv@EvnL)jwJ2@r!Gf|#DN3TGXE_)eY^`UM7D zO|EDL1O6%3$8)EnHz`aW++RQCO+4>BoUP_~Op7_Ka1_13!4Kxdr1Pl$-HY_!ZR|;O zc<|@xejl;UzWx>d)3dLC=kO0-KfynIUBZ8Q);GjJ#4ouK@t%2iiB{>%B5^YQfD*;;2)?1!{?~(l6X!|)(eRkS(4sZU zWdWfFOd=4i<#Fxs<`Or<^0$K%B$nKc22VC{HThvMg}W!4{$ta~SEorAigVyJ#g&7W zCe03~Iy2ye8I8#;7&-8=96OdZ5P{B^bmdbqpP`Au{g@n*%|O#atE$1OY+{b38EW|W z0AaV$1NFZ|ld|c5DU&dyxYZrN^KGQS6dI(IdHAH@`8HCv=4^8Ib3;--Z6~-<%HlIH zV&QB7Atp^!P-jE%*4~!v6%a~ZAT@wGbQR7P6|EO#h6K)Iwuojl&5W~AGs2J@X%A|m zo(e-A4Qo#sIOznMfBwugXoC~*sx|!;CwJT0sqojq+up+EN zuNl``kM^A~rGzjkE3bR)Yn0}iCKzM8k(aB4=DO*B*jmUkxr9}0UGYeMygjm4&Y6dZ z0DNcQCqjFLhSB7hOs48yF7M4F>Gbu;PSHJR#~X=e#R#{CiFhfAMaxyaFh0*g^0N$RYr^zwhNT_{?OcMq2Z%825~msTyoWA#mt|VOGOFv(&3mqWN48ZrCgtF| zQzTGAQfaP2!?TjeNc|Yk7Gk#7F5H_m2hP3KqWi*b+@*j-TVb{7grh5OqH0V)d}O|V zt1#FVa)Az4c525Hv>x_G$}&5^DiQ8r+VMD)kuY%OiaBr%uFyKrhEExo*A+l(=A_|D zqQ-7h9UAdlQ65NUWwTLe9E`#oi|FTnXeSMNlXQx?-mnh0$@Z08mby}P27sLzT@@+2 zEYDXNOP5(nD?6STlaaE`Pk3{9c&P7FcyL4>KZd93S&lIDPx@Aa9BGhi4)SMxt3jS< z5XM19NBUmF{L`W1({;81eEzQ~Tl@`svR-0DG<-nL=bP+JDYdJI)02FVJ zreLmb${Sj}fZ@^eKy%xod?TCSgQ-DiA5D_E#}++*ME#*-s@DG$s<4jrP3MrJG|>A_@6*JLstFsnv7#;WzqeaO}CG&+s8fpXr`A z7$$29V+$3yhR+;`E^4&I$>D(D|MWO8A}>p{TBjXX?Tyi_Hw!nFuK;nQ#Gd?%H|xvLN@eJl>?# zg5B~%nrzUu)%u{Ww8WsE9lYhYZV1X7Bl{jl7vM~a>z?4KA1&kLg2ff<0SDbfkW33a z_M-{CJ@~xac?7zcb-BldUgA70F#d(!Ur>0Q)c4r! z@@EHJQCUl=;gDRud--lmL>&u>MU98r0U=46;4Y3Rp7Izw?E(SEHHohLhb;JYGg z-vlI`)(v_5JF&g3#jpi3wm~%0JG$<$K72Qx3xL;!d_N$Ia)mB`r55*Fd^$=!EsUP; z?bJDkKVx$`0vmP`%q6(p8w!szIv3kH4tw+?PwsLjFMI=ov@ z{Sof?yFfP5*}D$q9{rFQ0*_Z%YLph_DvOIxa+iv?31P)d?Dg_W8XTvvw*QPnHS&!& zAPPOMclL3A0i@j%0G8iL>-XruWE|d-{$3)8Onx6b$fwzI5pPG15hRHGR+L$6M|Wy5 zfPnBs%IWgNj+nw;Rb?)t{hC#-69OVi2Jj9VgU_f2Z%lg-(9}E$3<7>P?{&YkraNA- z2QNh+HT>;E&#fftf9O9NIw3GL1k?{kFpJBH)wBeEtEGdHA>ObrfostEz9*8YXx*8O zCk()OQ_f=C$In496p4&@_l_EQZ+rz4nhmWPK?JLGCjOjW$E>U(F#79Nd`+=}6LT=l zHwNogmDY^WV`wuOko3AJE6R;-6(idmz!;(GY(LybQJf`&R0lgK^$pMA^T<;BNa%f} z!W*7{vmA&B#{xSNU`N})kiJSQhOBR7Lmq8|JW?htcZgtA#BVX#Il}T|V(yO|J2R#* zA_q=KTdOm-7)Q`QI19+rdPa)`d5#C<%H2YaVerhd6+{!BEBigf^2lQpDO}x)!a<0H z<4pocuHEoX+*@KUR;#RD(iUM^1*t}!R|67%x7hkDgK1UlHTQUY_P6Cg1ZsF31BOzO zvNX;(1comE^B@0hg(Kik_0E=XuliO8_%;Q{z;{8`EIkBI^q|{yyUq(`8qxcqC;$u8 zFWD6d4e5c(uf?W1@1JZpttfvVDudAbh1M>=li=_b60MX*q69i*P20TZSkHc%e1uMa z7YqZIUiXSuw}a}tN|TzOyA4YQ%-qJB-DpM^2g-B0UE$fg3DOC3?a z=SmzGAC7E;>hi_vi$M>y_R-uzc(rUNd)lPhv1o7Uq%{wPAWS{RJw$L%PIv78{RP`G zpK4RQ(M1Gym&L0k=CEJMl}Rtv`${H%mloW?-E9}&-oDq1%iR(J$DM$;%ezrx_)+nOvxv zQ!>Yv@-RTs%kOW=bK2X(uZy!atO#WnEb@NYgnO1jqVXD47p<|XcM%QOjzIK(Bs2VO zg4^Veht?#6{4Oh)L%#5=-lU5`-CtAuJm;T3@y|>C`9AGV4VonDRd<_uJ3h4G>#1%) zl~s}b{nQIip=a+olvA6)3jul~Oi%VwvQI|tIz)H;X^?=wxw_oiKx&Qrum%H9wQQ|* zb3l*wDjT9X!}zelR3DW03WSA!2aGo4(XEmlC~|Z5yGbY*W-UFqwYW|Rt?jCKRISjA zl)j&nWIN(}PhD0LskxtO%laFCi8q%&p;Y4^ zB7=uaM!R(Xfpi-Kype;qYe{ACr@!5)im}1yunw}WoLf?5+=7h(88|q0#Yq>dCE3~L%{78^i=oi#@J4e{3UW+YyD)>;Y~=v^4B)&IcN)7wMeY^=;c1Ee~7* zY%4fcTULz%<3?ezmBMc+Bz7kyTwS%NmCFj6JGfdOAefh!_R=bU1oJ93KrG+ff)gL} z_y5_&-*C7o#NB^&-9k>C&_Zf^|FZY@y?@>79$O3M9g+__vE?EdegFh?QKcsct6C>sJwFZu!eC_aI$BmGE7^L9 zzsHcl+#bzh(4}!EjgvrDLv81QOeo#MT^wsZcC1OBxk%C)qVu)bi!I86cALS1mtprt zn>|fB8^fXT;>@WQTfyno4t|;wZ5X?`=F!Kjn*8iP!)&^LGXq(%wtZk+?JbYn+#v#Z zC!NeXqZP|L5N@IB6Y4FP&cSqzw{bKT*c-PMbmwUcUxGU<6?QyjFfcCtu2y76{YKgf z@(eXct=68qr&qI^zfHIHS$j)M_V)c9=y}paw~GYsK-b6fZC#5Ch%T4-+e*-a3?Nxa z%Fnc_(uDGVANt@&p(>0z={#O#@^m!0S){WChz5UNAhM+2R-h0t9X5_0l?Ur=kDA>`1|YR^g+Z91S$Sxuy~ z$rVhV>kGzn%sAc6%6tit9mVqy+u-i$a`8`%MC^i z)(mT2zB`wB+c$th^)L|44MhGF8|59u=%Jhw@uO~d=(t<*UrLbei02XgvIOi}Wsd|Y zB=Ntq10Dkb2!p(DSovP99g_|pECZG#^piaw91VuNZ&>ex)j7r!000-0W*;X5nFc97ID=g2cLj?mws0%AhATgjQx;Sp);@FYz0z=gQjz0>tQWwj9ANSsQEg0hy zSiM(B?U(YXo#i#VEh7O7jn0QBe^!dUgS8+X5l^IrNkxjFGirm*)8>Gg`k%wMV*4O} zZZg~}lwQwtqF&%rAxm~-(I0PYL2UQXEDUA zjNjeIxCB%rW;<|pOq$NSZ&bbodFr$VG!@;$VyKOlXcg7Dxx5sSCUfN@f+&XsCn-y9 z-aS_ONCR?K`hJq5N(6rdW7@?V-0`M0{1qHB2Yvq*BVI$olL15#cRkOIK$Bd@a5lxU z_yJH$0|XQR000O8l%sE0>runf#}fbmU6Tw783U*I^OGnFDGx~7D#>2&`p&XlD_u4h zT9aT3IvmN0Ey`+4-cU+@jf*0lm5g=Xq%&H~=$M?nz95sf3cCi2vp1x33X^vWG64XS zstZ03&*9}?>K>ytON;9Z{pg&N_X{t7MJ!qX0(;FCIV>T^ns@{#KV}p!>(ezLzm0Q{ zHRrqAm*C?jf7|gU9I>KoRTX4vadnArHl2=Q*m(ymd!3tTz*(8C^5S)o&@U%N!r%YG zrF6SNpm|x5UPhVJOgXnjp=6ZKNl*5OgGJmN-lR2yky)@9?67CsMxT8Dy@cO?y9;4i zl`~q`G?7A6Z4z!sS_Amq@Q%?^sC7$~Z#7Qf5Nl=aC$Eu=BL4 z8E>FJX^4>P9-vOkBn2}HiVlr`!6n&Z(W0MGMvH5q$)Af~6R!dVA@zLV#Ket`j3 zlPj9RfPc#M@!aX?O$w6-_t#H(6VE#jXRA3L(_&6597Qj1@Pj!q>3r&e?UmHc09aEh zW7XPN3U_1Gs$gkOf1%g(3yjp^Z@mx6{-S^Up+3f|Twm4w<441E;vnO!d!GKgjXjMH z5B_|)-$$&|uYZOA^z`e08T`Z7Pw)?47x15+_6;!*@k?$*yk{gqBLNwLwIwu5^OV8E zZq%KSxQ2#T8BCk;5+n)JAHAraufW;qJ+%|JXG0)oId&;v6_lapj<; zNwdSL&I~wVMq_ddMh?6z$BtzUM4&S!UHMeZXK12uKPHD{Gtjiqs%o$*o0wy1h8jLT zK-g{cK>aV#q-=VB$|MXaZgmInd>bh+g$5~Q9zH2}zKxWvIh&mQ+>n${+X-%zviJ;) zSU6iih)EL_)Y%ZcwYMdE1%#3pNDZJ4U4^qnMe9YGA%U})EutAsGvjR3j4&ie+Jl;? zr^1j&!`f2@PC9|+pFcAV+TaAdDvdu)^n;DQl5BFD39o&T9jkwdKNQ%AD6gNfK?WqcmQGU`8e9&cY!yZ@HKL{h0GQUhKYA!h3c?I zZ6ky?eV3iaU~YEL8zDB^8)w|Pw00b3h`472>|!-XvMWwpmZXKvup+FYtr^!^kM^C& zq=d*QE3bR)%aZ0YCKy(`!IrCp=2B^5tzDU1wJNrMu6Xc1-X6>=f6Svo0KPNU6Vbdv z!vJzjrkCnouISAp>F4#xPSHJRUmJ;L#R#{Ci5^@EfV(}8+Yd5juP^N7g<7aezM|!- zUfhc^^tC-~|3=yin|8;1wh2opbc?VgfYmIDqgZ8Gzp>bG8&-WmecByqQVeyZ(j5`h zq+H^EnmY^2B#V+id5zA*x3y4epePUc;{)z~jM>d-men|pb|J!nWkOub;ppf{{Z0rzL!wpbETQAY0Xn} z+*eO8-I!{o;*?v0b36oon*our0N$854!jJ1%!KFg3L?(9=M0Uh#m%K!=QV?{sk0hn zi%VnrAwm%?ScM*~?}ux9&h%vzkfgPhoN^}yK&japHMgqZJ#@LdEYkwka$P@K*mLbW zvaPxiCIlD1B8wA}N^>b3o+m|G?8kVv5b=keRJ>_?;M`j+x-aa;T?$CF6;_*0INtMr zrq0Hc$VcY83L|bI7wB+h=a)P|>tS!CEK?M$5&;yIs!(DIEmfB1r9wKN{ev>S3On@yy)AxH_L(uiPe-v z$hjH69Fmo%Jm8>-aO=N6y7ijgeD~;oHr@Q*cM<(W@w7p2nqFeUIjqBNvVA4j#;#PI z0br+RS4GM$%Cl9*(q)#?%8qcxWTb5K6W$yi9_srP9vqR!kKw6$mLm-PlfKm;M;hds zgZx?FYLF)ygmIA3k-pb3|8(g1be-}5pZ{yh7JtK@td|(04Ihwr`X+l*35g4T5s|lq zI%1-?6%jF5(!AhXW7@QkUanSfnyy^;G`s7hZ*xB+M`8j8s4e5FrmwOxW&&_Jy7ZQh zXbk`;-X2|oJ-#V#X!Qc@zvqGGw#oQbG{py(2BCepNah|}^!y?7hYp%{cPSkcD3@n! zUX>MyVL*b;$rRq} zrjziDtbAqEn)1|+KFGy7Pj+Zbq(>X=c?nWClcPiua@=-QQQ32+=gq@!^wZ$jb4Q=y zLykVvJ#R2f*A&JUDsT;-IS^gcXo=Iq0m1*vNnk`?lxVe1JFeOrqgii%OTs$)eOZqN zL|h!HizmEMHMj?QAgikEfX}xW)5a5q@ZNN1;n{)=iN)Z z+{^NKlTr(I%MWR?LDyF6gSyfZWO{b+mfyNDCU1=FdmNpEGbyfnf}?)4jFWQ~SF8sd zbPqu?E%4ZnCiM2`@^0sUE%^Vx@!Aj0521HIUH>BX8^RIiALP{KP8xcNv$Vhf7kYnA z;c-&mV^7VW9dOBHt(AsDa`EovyD<^fG9(t2Bx;|9Bx!` z@92T=3Y~oukaSwN{qgVE_O=$o7RcBJ(M<2?y2JYL-FPklUKjFz{eUdW6}psK+;8#e zDD|{3dcL<)=N$fw&FKhi6!O**$ajAWi7B0k0gNiT%;FjCbr)S2@VGL6O#XDpKiXEm zO&hkN!XQr)%;(A%sK=nhGA!mci#u><$f^l0$emKR$6Xy{N&*|EYROa^KfdaPD)yV5 z-&ZZ(&&@jY|DXGRS(OeqX{z^Cxug{XKRMu%Qb~;$j`I~dRc$$W5mV5hoO7CG{~Tv4 z4I$UK3SOsW7IA&C;K>d3B;^SX9_Fh@39V=9n&%+pDib}H%l{n<#cc~jmRuO0wl%7? zW7@Wewi(X`qgkHgu^Vow5+V)u%uKUsr3L-Wdwsr**X{a$IYMi6>=`XYYCUTz*L(;} zpYU*~6++E$tpKWGz=N<<53Q`vFn0PoL|0qDF!`N2@c{&cCsIzACw9aX_Npp#8SU4sa-9$mQ8Ivc&=`D1HF#s%gMg;ySzZwEyLqqs zoi*L@x&Jh+l6LWv$ z*qJef5jk)=+FAp;#W;fg!C63_)H7Nn$a6d(SMDBh41;Hutst84T-om-mPa0=Na5;U z6b?cp9B&dpa_xq9;@%Q-v07#IlC}uTDtk45^1K?5xW(3I8BD8UGr7m(v%f6|B2dFa zA25`Pl%;XTAux3Lpa1x8D;xoTs<*C$d)2o(z_%$l2EGfjX6Ye#q6gis+jU->(}>;= zMa@~DWXdi%Xh;uKel2#*dH-a)X+`<_P@RL`5VW@Oodk!kkZ7ee5+%?fYue^L$Ex{% zljI|Gx?mWv^txBPh8|SkRhrcN+-+DgVCFW~>_#)XKtLCI;7&II|7>E}?S5LavyDVNUF^Bz1u1tD=soqyIxwPOG?QYxj_WrzHT<(?-m~;Z-f*Ai- zN|I8Xrc>v~aKMu)W($bv8HiJa*<(HMc$FN@!M!nRoeyiA%#k3LyOdA9u@fi2=~NiE!x zucx{JRX0WU_fs!8g`U0VP)_jy-|6p-Fg@8z$vzpm>k!@Xr$GY#=IU~51F1Fg!x{`c z)v~qL%>g~yt89qo4CBKFQ+-f>-YXCm9%I^&N4H9LpvcYX?oamj60cySA(1 zQME!dQu>BoZ|!pz!u77dgpr#@avs3PX)e)P-_oTT!c3r|Uj z7Hm%}s;6Zp**nIv1(ge_4LtN5kIh`dMBtO!1P<2PCBwEa(cxKW2O=1EiF2MSeoj@E z?8n?JS@v&V?SX!Zd299kN7cj5z$)Qfb^>|(at1^$YN2 zn>zL$`ySR>5S&|!0p)lD$+kb_@S&o=XOy|)o2K5>L(KyOuHPm*X$Aro~+@-OmV8?*up@}4|A^Kj6z1E^EXtx<3co}qW zfY~#nv+)}mBF;2wu@#(A?Rcj-w}!EsYZ`q{s>#p(Gt8EMJClwTUfajc)!y;A%>yEU zcT~wNWLmMjW91gAKIh(o=^Ss@cpFDkfxT~AL3bXP@Flpz>R`uX0t4g4?`lPM)NiD% z;LcEU)N1XidwMmy_1ko7pV+swWN**kfu1K#bh`-P4s?CU-`2IbfPiv|zt99N$e59p zr2I^)DorSV|G5x;mZ`!(lg{H+CJ$Vbn?*WXfN1bX3L;DTZ3PGc;{luDMY?`5dvF6O zT>a2O73*;CN!38#*jJL9O%*LyB&^0>armuIrfm>VTR~NOM=CaR%HOr2I zg-34b(RTM~6((6m74+WsuE0{%w&gy|n#+W6Em0runf#}fbmU6W-WCj+PW P^OKJsAO-^-00000A~@ve diff --git a/browser-extensions/chrome/table-sort.js b/browser-extensions/chrome/table-sort.js index 54aca82..300da8b 100644 --- a/browser-extensions/chrome/table-sort.js +++ b/browser-extensions/chrome/table-sort.js @@ -82,7 +82,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { break; } const tableColumn = tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( column.span[columnIndex] === 1 ? column.spanSum[columnIndex] - 1 @@ -125,11 +125,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { headers: [], }; for (let index of table.theads.keys()) { - if (table.theads.item(index).querySelectorAll("th").length == 0) { - table.headers.push(table.theads.item(index).querySelectorAll("td")); - } else { - table.headers.push(table.theads.item(index).querySelectorAll("th")); - } + table.headers.push( + table.theads.item(index).querySelectorAll("* > th , * > td") + ); } for (let index of table.bodies.keys()) { if (table.bodies.item(index) == null) { @@ -200,7 +198,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { }; const numberWithUnitType = /([.0-9]+)\s?(B|KB|KiB|MB|MiB|GB|GiB|TB|TiB)/i; for (let [i, tr] of table.visibleRows.entries()) { - let fileSizeTd = tr.querySelectorAll("td").item(columnIndex).textContent; + let fileSizeTd = tr + .querySelectorAll("* > th , * > td") + .item(columnIndex).textContent; let match = fileSizeTd.match(numberWithUnitType); if (match) { let number = parseFloat(match[1]); @@ -465,7 +465,8 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { "NaN" ); } - tr.querySelectorAll("td").item(columnIndex).innerHTML = fileSizeInBytesHTML; + tr.querySelectorAll("* > th , * > td").item(columnIndex).innerHTML = + fileSizeInBytesHTML; return table.hasClass.cellsSort ? tr.innerHTML : tr.outerHTML; } @@ -532,7 +533,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { const column = { getColumn: function getColumn(tr, colSpanSum, colSpanData) { return tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( colSpanData[columnIndex] === 1 ? colSpanSum[columnIndex] - 1 diff --git a/browser-extensions/firefox/table-sort-js.zip b/browser-extensions/firefox/table-sort-js.zip index 25d503d556106dfd22e4d70b6741c61b110481f5..8b682a74158ecd4ae3503cd445b5952decd5975a 100644 GIT binary patch delta 5075 zcmV;^6D;huKea!wvj_--yl+^%s_k%-y9gc!mL&9LmL&9(;0PUmQz`}&A(pN%fy98K z=;FAIi(^N=3k*^IJN_upN?k1becXHJrC^MYVD&*EwO`7kc9z#{S4IM68k`SL{;U*x z2Wvq(BA!SKqly$kXVeCrr_Bj7^*@K-iQQIgGu$hbUQcwUUf@$9OLk<@A8%|%ZIA3~ zXw3$q3G1plY8vK$PDnRaq0wKV>P81Goy8EdFn<3K;}TGjnCy|WHEBBUzESxWHA3zDiQn_Y@QF9& zui%t9==--A@fs5L1`tKu^)fdCO>(W_Y>Kt`0Z>Z=1QY-f000O8hP-cB?}ODj#uESl z7n2MM83UUn^phwGDGw;yD#>2&`p&XlD_u4hnv-A(IvnYWEy`+4-cU+@jf*0lm5g=X zq%&H~=$M?pz9f^j3cCi&^Eae(29tLSG64dUstZ03FW}{0>K>ytON;AE{pf;|_X{t7 zWh`0%0(;FCIV>S3ns@{#KV}p!>$5c=zm0Q{HRrqAm*C?jf7|hnIbucGsw&9D;%bU- zHl2=Q*m(ymd!0MhfU`1N<;CkFpYBeP&J*kRAMjXwGQdkMdPcNfC4DrdB=X(END+9ceNvJd7ZE;qef~%O#BN7mGCW z7>}y*rk)&5C7$~Z#7Qf5MnRdh=aC$Eu=BL48E>F}+z=txJwTn6NeX5Z6df9WgG;i- zqD4QWj272yL7qK(Mh=Z~cT(1|1a3C@j}@)f7c`?Ym~Bq844S(tleKB?IT@M82pJAR zF~twyYdH>~`I4;(#{usXa~DLeP{y>9yww_64#%B17#Ah$jSIFom~kZ@_4{4jj}4*V zv@EvnL)jwJ2@r!Gf|#DN3TGXE_)eY^`UM7DO|EDL1O6%3$8)EnHz`aW++RQCO+4>B zoUP_~Op7_Ka1_13!4Kxdr1Pl$-HY_!ZR|;Oc<|@xejl;UzWx>d)3dLC=kO0-KfynI zUBZ8Q);GjJ#4ouK@t%2iiB{>% zB5^YQfD*;;2)?1!{?~(l6X!|)(eRkS(4sZUWdWfFOd=4i<#Fxs<`Or<^0$K%B$nKc z22VC{HThvMg}W!4{$ta~SEorAigVyJ#g&7WCe03~Iy2ye8I8#;7&-8=96OdZ5P{B^ zbmdbqpP`Au{g@n*%|O#atE$1OY+{b38EW|W0AaV$1NFZ|ld|c5DU&dyxYZrN^KGQS z6dI(IdHAH@`8HCv=4^8Ib3;--Z6~-<%HlIHV&QB7Atp^!P-jE%*4~!v6%a~ZAT@wG zbQR7P6|EO#h6K)Iwuojl&5W~AGs2J@X%A|mo(e-A4Qo#sIOznMfBwugXoC~*sx|!;CwJT0sqojq+up+ENuNl``kM^A~rGzjkE3bR)Yn0}iCKzM8 zk(aB4=DO*B*jmUkxr9}0UGYeMygjm4&Y6dZ0DNcQCqjFLhSB7hOs48yF7M4F>Gbu; zPSHJR#~X=e#R#{CiFhfAMaxyaFh0*g^0N$RYr^zwhNT_{?OcMq2Z%825~msTyoWA#mt|VOGOFv(&3mqWN48ZrCgtF|QzTGAQfaP2!?TjeNc|Yk7Gk#7F5H_m z2hP3KqWi*b+@*j-TVb{7grh5OqH0V)d}O|Vt1#FVa)Az4c525Hv>x_G$}&5^DiQ8r z+VMD)kuY%OiaBr%uFyKrhEExo*A+l(=A_|DqQ-7h9UAdlQ65NUWwTLe9E`#oi|FTn zXeSMNlXQx?-mnh0$@Z08mby}P27sLzT@@+2EYDXNOP5(nD?6STlaaE`Pk3{9c&P7F zcyL4>KZd93S&lIDPx@Aa9BGhi4)SMxt3jS<5XM19NBUmF{L`W1({;81eEzQ~Tl@`s zvR-0DG<-nL=bP+JDYdJI)02FVJreLmb${Sj}fZ@^eKy%xod?TCSgQ-Di zA5D_E#}++*ME#*-s@DG$s<4jrP3MrJG|> zA_@6*JLstFsnv7#;WzqeaO}CG&+s8fpXr`A7$$29V+$3yhR+;`E^4&I$>D(D|MWO8 zA}>p{TBjXX?Tyi_Hw!nFuK;nQ#Gd?%H|xvLN@eJl>?#g5B~%nrzUu)%u{Ww8WsE9lYhYZV1X7 zBl{jl7vM~a>z?4KA1&kLg2ff<0SDbfkW33a_M-{CJ@~xac?7zcb-BldUgA70F#d(!Ur>0Q)c4r!@@EHJQCUl=;gDRud--lmL>&u>MU98r z0U=46;4Y3Rp7Izw?E(SEHHohLhb;JYGg-vlI`)(v_5JF&g3#jpi3wm~%0JG$<$ zK72Qx3xL;!d_N$Ia)mB`r55*Fd^$=!EsUP;?bJDkKVx$`0vmP`%q6(p8w!szIv3kH4tw+?PwsLjFMI=ov@{Sof?yFfP5*}D$q9{rFQ0*_Z%YLph_ zDvOIxa+iv?31P)d?Dg_W8XTvvw*QPnHS&!&APPOMclL3A0i@j%0G8iL>-XruWE|d- z{$3)8Onx6b$fwzI5pPG15hRHGR+L$6M|Wy5fPnBs%IWgNj+nw;Rb?)t{hC#-69OVi z2Jj9VgU_f2Z%lg-(9}E$3<7>P?{&YkraNA-2QNh+HT>;E&#fftf9O9NIw3GL1k?{k zFpJBH)wBeEtEGdHA>ObrfostEz9*8YXx*8OCk()OQ_f=C$In496p4&@_l_EQZ+rz4 znhmWPK?JLGCjOjW$E>U(F#79Nd`+=}6LT=lHwNogmDY^WV`wuOko3AJE6R;-6(idm zz!;(GY(LybQJf`&R0lgK^$pMA^T<;BNa%f}!W*7{vmA&B#{xSNU`N})kiJSQhOBR7 zLmq8|JW?htcZgtA#BVX#Il}T|V(yO|J2R#*A_q=KTdOm-7)Q`QI19+rdPa)`d5#C< z%H2YaVerhd6+{!BEBigf^2lQpDO}x)!a<0H<4pocuHEoX+*@KUR;#RD(iUM^1*t}! zR|67%x7hkDgK1UlHTQUY_P6Cg1ZsF31BOzOvNX;(1comE^B@0hg(Kik_0E=XuliO8 z_%;Q{z;{8`EIkBI^q|{yyUq(`8qxcqC;$u8FWD6d4e5c(uf?W1@1JZpttfvVDudAb zh1M>=li=_b60MX*q69i*P20TZSkHc%e1uMa7YqZIUiXSuw}a}tN|TzOyA4YQ%-qJB z-DpM^2g-B0UE$fg3DOC3?a=SmzGAC7E;>hi_vi$M>y_R-uzc(rUN zd)lPhv1o7Uq%{wPAWS{RJw$L%PIv78{RP`GpK4RQ(M1Gym&L0k=CEJMl}Rtv`${H% zmloW?-E9}&-oDq1%iR(J$DM$;%ezrx_)+nOvxvQ!>Yv@-RTs%kOW=bK2X(uZy!atO#Wn zEb@NYgnO1jqVXD47p<|XcM%QOjzIK(Bs2VOg4^Veht?#6{4Oh)L%#5=-lU5`-CtAu zJm;T3@y|>C`9AGV4VonDRd<_uJ3h4G>#1%)l~s}b{nQIip=a+olvA6)3jul~Oi%Vw zvQI|tIz)H;X^?=wxw_oiKx&Qrum%H9wQQ|*b3l*wDjT9X!}zelR3DW03WSA!2aGo4 z(XEmlC~|Z5yGbY*W-UFqwYW|Rt?jCKRISjAl)j&nWIN(}PhD0LskxtO%laFCi8q%&p;Y4^B7=uaM!R(Xfpi-Kype;qYe{ACr@!5) zim}1yunw}WoLf?5+=7h(88|q0#Yq>dC zE3~L%{78^i=oi#@J4e{3UW z+YyD)>;Y~=v^4B)&IcN)7wMeY^=;c1Ee~7*Y%4fcTULz%<3?ezmBMc+Bz7kyTwS%N zmCFj6JGfdOAefh!_R=bU1oJ93KrG+ff)gL}_y5_&-*C7o#NB^&-9k>C&_Zf^|FZY@ zy?@>79$O3M9g+__vE?EdegFh?QKcsct6C>sJwFZu!eC_aI$BmGE7^L9zsHcl+#bzh(4}!EjgvrDLv81QOeo#M zT^wsZcC1OBxk%C)qVu)bi!I86cALS1mtprtn>|fB8^fXT;>@WQTfyno4t|;wZ5X?` z=F!Kjn*8iP!)&^LGXq(%wtZk+?JbYn+#v#ZC!NeXqZP|L5N@IB6Y4FP&cSqzw{bKT z*c-PMbmwUcUxGU<6?QyjFfcCtu2y76{YKgf@(eXct=68qr&qI^zfHIHS$j)M_V)c9 z=y}paw~GYsK-b6fZC#5Ch%T4-+e*-a3?Nxa%Fnc_(uDGVANt@&p(>0z={#O#@^m!0 zS){WChz5UNAhM+2R-h0t9X5_0l?Ur=kDA>`1|YR^g+Z91S$Sxuy~$rVhV>kGzn%sAc6%6tit9mVqy+u-i$a`8`%MC^i)(mT2zB`wB+c$th^)L|44MhGF8|59u z=%Jhw@uO~d=(t<*UrLbei02XgvIOi}Wsd|YB=Ntq10Dkb2!p(DSiGw3aFY%nECZG# p^piaw91VuNZ&>ex)j7r!000-0W*;X5ntQWwj9ANSsQEg0hySiM(B?U(YXo#i#VEh7O7jn0QBe^!dU zgS8+X5l^IrNkxjFGirm*)8>Gg`k%wMV*4O>bYaUe9!*Uf@$9OLk<@A8%|yZ3lKS zv}PmGjCEBFn#QGn6VgppX!KX8y3#>QXEDUAjNjeIxCB%rW;<|pOq$NSZ&bbodFr$V zG!@;$VyKOlXcg7Dxx5sSCUfN@f+&XsCn-y9-aS_ONCR?K`hJq5N(6rdW7@?V-0`OT z6&x}Leg76CUPHo@0YnjZJZ=1QY-f000O8l%sE0>runf#}fbm zU6Tw783U*I^OGnFDGx~7D#>2&`p&XlD_u4hT9aT3IvmN0Ey`+4-cU+@jf*0lm5g=X zq%&H~=$M?nz95sf3cCi2vp1x33X^vWG64XSstZ03&*9}?>K>ytON;9Z{pg&N_X{t7 zMJ!qX0(;FCIV>T^ns@{#KV}p!>(ezLzm0Q{HRrqAm*C?jf7|gU9I>KoRTX4vadnAr zHl2=Q*m(ymd!3tTz*(8C^5S)o&@U%N!r%YGrF6SNpm|x5UPhVJOgXnjp=6ZKNl*5O zgGJmN-lR2yky)@9?67CsMxT8Dy@cO?y9;4il`~q`G?7A6Z4z!sS_Amq@Q%?^sC7$~Z#7Qf5Nl=aC$Eu=BL48E>FJX^4>P9-vOkBn2}HiVlr`!6n&Z z(W0MGMvH5q$)Af~6R!dVA@zLV#Ket`j3lPj9RfPc#M@!aX?O$w6-_t#H(6VE#j zXRA3L(_&6597Qj1@Pj!q>3r&e?UmHc09aEhW7XPN3U_1Gs$gkOf1%g(3yjp^Z@mx6 z{-S^Up+3f|Twm4w<441E;vnO!d!GKgjXjMH5B_|)-$$&|uYZOA^z`e08T`Z7Pw)?4 z7x15+_6;!*@k?$*yk{gqBLNwLwIwu5^OV8EZq%KSxQ2#T8BCk;5+n)JAHAraufW;qJ+%|JXG0)oId&;v6_lapj<;NwdSL&I~wVMq_ddMh?6z$BtzUM4&S! zUHMeZXK12uKPHD{Gtjiqs%o$*o0wy1h8jLTK-g{cK>aV#q-=VB$|MXaZgmInd>bh+ zg$5~Q9zH2}zKxWvIh&mQ+>n${+X-%zviJ;)SU6iih)EL_)Y%ZcwYMdE1%#3pNDZJ4 zU4^qnMe9YGA%U})EutAsGvjR3j4&ie+Jl;?r^1j&!`f2@PC9|+pFcAV+TaAdDvdu) z^n;DQl5BFD39o&T9jkwdKNQ%AD6gNfK?Wq zcmQGU`8e9&cY!yZ@HKL{h0GQUhKYA!h3c?IZ6ky?eV3iaU~YEL8zDB^8)w|Pw00b3 zh`472>|!-XvMWwpmZXKvup+FYtr^!^kM^C&q=d*QE3bR)%aZ0YCKy(`!IrCp=2B^5 ztzDU1wJNrMu6Xc1-X6>=f6Svo0KPNU6Vbdv!vJzjrkCnouISAp>F4#xPSHJRUmJ;L z#R#{Ci5^@EfV(}8+Yd5juP^N7g<7aezM|!-Ufhc^^tC-~|3=yin|8;1wh2opbc?Vg zfYmIDqgZ8Gzp>bG8&-WmecByqQVeyZ(j5`hq+H^EnmY^2B#V+id5zA*x3y4epePUc z;{)z~jM>d-men|pb|J!nWkOub;ppf{{Z0rzL!wpbETQAY0Xn}+*eO8-I!{o;*?v0b36oon*our0N$85 z4!jJ1%!KFg3L?(9=M0Uh#m%K!=QV?{sk0hni%VnrAwm%?ScM*~?}ux9&h%vzkfgPh zoN^}yK&japHMgqZJ#@LdEYkwka$P@K*mLbWvaPxiCIlD1B8wA}N^>b3o+m|G?8kVv z5b=keRJ>_?;M`j+x-aa;T?$CF6;_*0INtMrrq0Hc$VcY83L|bI7wB+h=a)P|>tS!C zEK?M$5&;yIs!(D zIEmfB1r9wKN{ev>S3On@yy)AxH_L(uiPe-v$hjH69Fmo%Jm8>-aO=N6y7ijgeD~;o zHr@Q*cM<(W@w7p2nqFeUIjqBNvVA4j#;#PI0br+RS4GM$%Cl9*(q)#?%8qcxWTb5K z6W$yi9_srP9vqR!kKw6$mLm-PlfKm;M;hdsgZx?FYLF)ygmIA3k-pb3|8(g1be-}5 zpZ{yh7JtK@td|(04Ihwr`X+l*35g4T5s|lqI%1-?6%jF5(!AhXW7@QkUanSfnyy^; zG`s7hZ*xB+M`8j8s4e5FrmwOxW&&_Jy7ZQhXbk`;-X2|oJ-#V#X!Qc@zvqGGw#oQb zG{py(2BCepNah|}^!y?7hYp%{cPSkcD3@n!UX>MyVL*b;$rRq}rjziDtbAqEn)1|+KFGy7Pj+Zbq(>X= zc?nWClcPiua@=-QQQ32+=gq@!^wZ$jb4Q=yLykVvJ#R2f*A&JUDsT;-IS^gcXo=Iq z0m1*vNnk`?lxVe1JFeOrqgii%OTs$)eOZqNL|h!HizmEMHMj?QAgikEfX}xW)5a5q@ZNN1;n{)=iN)Z+{^NKlTr(I%MWR?LDyF6gSyfZWO{b+ zmfyNDCU1=FdmNpEGbyfnf}?)4jFWQ~SF8sdbPqu?E%4ZnCiM2`@^0sUE%^Vx@!Aj0 z521HIUH>BX8^RIiALP{KP8xcNv$Vhf7kYnA;c-&mV^7VW9dOBHt(AsDa`EovyD<^f zG9(t2Bx;|9Bx!`@92T=3Y~oukaSwN{qgVE_O=$o7RcBJ z(M<2?y2JYL-FPklUKjFz{eUdW6}psK+;8#eDD|{3dcL<)=N$fw&FKhi6!O**$ajAW zi7B0k0gNiT%;FjCbr)S2@VGL6O#XDpKiXEmO&hkN!XQr)%;(A%sK=nhGA!mci#u>< z$f^l0$emKR$6Xy{N&*|EYROa^KfdaPD)yV5-&ZZ(&&@jY|DXGRS(OeqX{z^Cxug{X zKRMu%Qb~;$j`I~dRc$$W5mV5hoO7CG{~Tv44I$UK3SOsW7IA&C;K>d3B;^SX9_Fh@ z39V=9n&%+pDib}H%l{n<#cc~jmRuO0wl%7?W7@Wewi(X`qgkHgu^Vow5+V)u%uKUs zr3L-Wdwsr**X{a$IYMi6>=`XYYCUTz*L(;}pYU*~6++E$tpKWGz=N<<53Q`vFn0Po zL|0qDF!`N2@c{&cCsIzACw9aX_Npp#8SU4s za-9$mQ8Ivc&=`D1HF#s%gMg;ySzZwEyLqqsoi*L@x&Jh+l6LWv$*qJef5jk)=+FAp;#W;fg!C63_)H7Nn z$a6d(SMDBh41;Hutst84T-om-mPa0=Na5;U6b?cp9B&dpa_xq9;@%Q-v07#IlC}uT zDtk45^1K?5xW(3I8BD8UGr7m(v%f6|B2dFaA25`Pl%;XTAux3Lpa1x8D;xoTs<*C$ zd)2o(z_%$l2EGfjX6Ye#q6gis+jU->(}>;=Ma@~DWXdi%Xh;uKel2#*dH-a)X+`<_ zP@RL`5VW@Oodk!kkZ7ee5+%?fYue^L$Ex{%ljI|Gx?mWv^txBPh8|SkRhrcN+-+Dg zVCFW~>_#)XKtLCI;7&II|7>E}?S5LavyDVNUF^Bz1u1tD= zsoqyIxwPOG?QYxj_WrzHT<(?-m~;Z-f*Ai-N|I8Xrc>v~aKMu)W($bv8HiJa*<(HM zc$FN@!M!nRoeyiA%#k3LyOdA9u@fi2=~NiE!xucx{JRX0WU_fs!8g`U0VP)_jy-|6p- zFg@8z$vzpm>k!@Xr$GY#=IU~51F1Fg!x{`c)v~qL%>g~yt89qo4CBKFQ+-f>-YXCm z9%I^&N4H9LpvcYX?oamj60cySA(1QME!dQu>BoZ|!pz!u77dgpr#@avs3PX)e)P-_oTT!c3r|Uj7Hm%}s;6Zp**nIv1(ge_4LtN5kIh`d zMBtO!1P<2PCBwEa(cxKW2O=1EiF2MSeoj@E?8n?JS@ zv&V?SX!Zd299kN7cj5z$)Qfb^>|(at1^$YN2n>zL$`ySR>5S&|!0p)lD$+kb_@S&o= zXOy|)o2K5>L(KyOuHPm*X$Aro~ z+@-OmV8?*up@}4|A^Kj6z1E^EXtx<3co}qWfY~#nv+)}mBF;2wu@#(A?Rcj-w}!Es zYZ`q{s>#p(Gt8EMJClwTUfajc)!y;A%>yEUcT~wNWLmMjW91gAKIh(o=^Ss@cpFDk zfxT~AL3bXP@Flpz>R`uX0t4g4?`lPM)NiD%;LcEU)N1XidwMmy_1ko7pV+swWN**k zfu1K#bh`-P4s?CU-`2IbfPiv|zt99N$e59pr2I^)DorSV|G5x;mZ`!(lg{H+CJ$Vb zn?*WXfN1bX3L;DTZ3PGc;{luDMY?`5dvF6OT>a2O73*;CN!38#*jJL9O z%*LyB&^0>armuIrfm>VTR~NOM=CaR%HOr2Ig-34b(RTM~6((6m74+WsuE0{%w&gy| zn#+W6Em0runf#}fbmU6W-WCj+PW^OKJsAO-^-00000d9mD* diff --git a/browser-extensions/firefox/table-sort.js b/browser-extensions/firefox/table-sort.js index 54aca82..300da8b 100644 --- a/browser-extensions/firefox/table-sort.js +++ b/browser-extensions/firefox/table-sort.js @@ -82,7 +82,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { break; } const tableColumn = tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( column.span[columnIndex] === 1 ? column.spanSum[columnIndex] - 1 @@ -125,11 +125,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { headers: [], }; for (let index of table.theads.keys()) { - if (table.theads.item(index).querySelectorAll("th").length == 0) { - table.headers.push(table.theads.item(index).querySelectorAll("td")); - } else { - table.headers.push(table.theads.item(index).querySelectorAll("th")); - } + table.headers.push( + table.theads.item(index).querySelectorAll("* > th , * > td") + ); } for (let index of table.bodies.keys()) { if (table.bodies.item(index) == null) { @@ -200,7 +198,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { }; const numberWithUnitType = /([.0-9]+)\s?(B|KB|KiB|MB|MiB|GB|GiB|TB|TiB)/i; for (let [i, tr] of table.visibleRows.entries()) { - let fileSizeTd = tr.querySelectorAll("td").item(columnIndex).textContent; + let fileSizeTd = tr + .querySelectorAll("* > th , * > td") + .item(columnIndex).textContent; let match = fileSizeTd.match(numberWithUnitType); if (match) { let number = parseFloat(match[1]); @@ -465,7 +465,8 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { "NaN" ); } - tr.querySelectorAll("td").item(columnIndex).innerHTML = fileSizeInBytesHTML; + tr.querySelectorAll("* > th , * > td").item(columnIndex).innerHTML = + fileSizeInBytesHTML; return table.hasClass.cellsSort ? tr.innerHTML : tr.outerHTML; } @@ -532,7 +533,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { const column = { getColumn: function getColumn(tr, colSpanSum, colSpanData) { return tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( colSpanData[columnIndex] === 1 ? colSpanSum[columnIndex] - 1 diff --git a/npm/table-sort.js b/npm/table-sort.js index 54aca82..300da8b 100644 --- a/npm/table-sort.js +++ b/npm/table-sort.js @@ -82,7 +82,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { break; } const tableColumn = tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( column.span[columnIndex] === 1 ? column.spanSum[columnIndex] - 1 @@ -125,11 +125,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { headers: [], }; for (let index of table.theads.keys()) { - if (table.theads.item(index).querySelectorAll("th").length == 0) { - table.headers.push(table.theads.item(index).querySelectorAll("td")); - } else { - table.headers.push(table.theads.item(index).querySelectorAll("th")); - } + table.headers.push( + table.theads.item(index).querySelectorAll("* > th , * > td") + ); } for (let index of table.bodies.keys()) { if (table.bodies.item(index) == null) { @@ -200,7 +198,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { }; const numberWithUnitType = /([.0-9]+)\s?(B|KB|KiB|MB|MiB|GB|GiB|TB|TiB)/i; for (let [i, tr] of table.visibleRows.entries()) { - let fileSizeTd = tr.querySelectorAll("td").item(columnIndex).textContent; + let fileSizeTd = tr + .querySelectorAll("* > th , * > td") + .item(columnIndex).textContent; let match = fileSizeTd.match(numberWithUnitType); if (match) { let number = parseFloat(match[1]); @@ -465,7 +465,8 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { "NaN" ); } - tr.querySelectorAll("td").item(columnIndex).innerHTML = fileSizeInBytesHTML; + tr.querySelectorAll("* > th , * > td").item(columnIndex).innerHTML = + fileSizeInBytesHTML; return table.hasClass.cellsSort ? tr.innerHTML : tr.outerHTML; } @@ -532,7 +533,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { const column = { getColumn: function getColumn(tr, colSpanSum, colSpanData) { return tr - .querySelectorAll("td") + .querySelectorAll("* > th , * > td") .item( colSpanData[columnIndex] === 1 ? colSpanSum[columnIndex] - 1