From f1483f4595c6870e67afe97b6bac208303e634ef Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Fri, 17 Feb 2017 01:37:43 +0100 Subject: [PATCH] Forms/Placeholder * removed placeholder text images for input fields * readded text as placeholder attribute --- setup/tools/filegen/templates/power.js.in | 2 +- static/css/aowow.css | 8 +- static/css/locale_dede.css | 12 --- static/css/locale_enus.css | 12 --- static/css/locale_eses.css | 13 --- static/css/locale_frfr.css | 13 --- static/css/locale_ruru.css | 13 --- static/images/dede/searchdatabase.gif | Bin 544 -> 0 bytes static/images/dede/searchwithinresults.gif | Bin 622 -> 0 bytes static/images/dede/searchwithinresults2.gif | Bin 773 -> 0 bytes static/images/enus/searchdatabase.gif | Bin 455 -> 0 bytes static/images/enus/searchwithinresults.gif | Bin 554 -> 0 bytes static/images/enus/searchwithinresults2.gif | Bin 728 -> 0 bytes static/images/eses/searchdatabase.gif | Bin 583 -> 0 bytes static/images/eses/searchwithinresults.gif | Bin 592 -> 0 bytes static/images/eses/searchwithinresults2.gif | Bin 712 -> 0 bytes static/images/frfr/searchdatabase.gif | Bin 535 -> 0 bytes static/images/frfr/searchwithinresults.gif | Bin 661 -> 0 bytes static/images/frfr/searchwithinresults2.gif | Bin 760 -> 0 bytes static/images/ruru/searchdatabase.gif | Bin 653 -> 0 bytes static/images/ruru/searchwithinresults.gif | Bin 663 -> 0 bytes static/images/ruru/searchwithinresults2.gif | Bin 798 -> 0 bytes static/js/Profiler.js | 10 +-- static/js/ShowOnMap.js | 2 +- static/js/Summary.js | 6 +- static/js/basic.js | 6 +- static/js/global.js | 88 ++++++++------------ static/js/locale_dede.js | 5 ++ static/js/locale_enus.js | 7 +- static/js/locale_eses.js | 5 ++ static/js/locale_frfr.js | 5 ++ static/js/locale_ruru.js | 5 ++ static/js/screenshot.js | 8 +- 33 files changed, 84 insertions(+), 136 deletions(-) delete mode 100644 static/images/dede/searchdatabase.gif delete mode 100644 static/images/dede/searchwithinresults.gif delete mode 100644 static/images/dede/searchwithinresults2.gif delete mode 100644 static/images/enus/searchdatabase.gif delete mode 100644 static/images/enus/searchwithinresults.gif delete mode 100644 static/images/enus/searchwithinresults2.gif delete mode 100644 static/images/eses/searchdatabase.gif delete mode 100644 static/images/eses/searchwithinresults.gif delete mode 100644 static/images/eses/searchwithinresults2.gif delete mode 100644 static/images/frfr/searchdatabase.gif delete mode 100644 static/images/frfr/searchwithinresults.gif delete mode 100644 static/images/frfr/searchwithinresults2.gif delete mode 100644 static/images/ruru/searchdatabase.gif delete mode 100644 static/images/ruru/searchwithinresults.gif delete mode 100644 static/images/ruru/searchwithinresults2.gif diff --git a/setup/tools/filegen/templates/power.js.in b/setup/tools/filegen/templates/power.js.in index 56438dd6..aee4548c 100644 --- a/setup/tools/filegen/templates/power.js.in +++ b/setup/tools/filegen/templates/power.js.in @@ -304,7 +304,7 @@ if (typeof $WowheadPower == "undefined") { i1 = 1; i2 = 2; url = rel.match(/(item|quest|spell|achievement|event|npc|object|itemset|currency).?(-?[0-9]+)/); - // if (url == null) { // sarjuuk: also matches 'profiler' and 'profiles' which screws with the language-menu workaround + // if (url == null) { // aowow: also matches 'profiler' and 'profiles' which screws with the language-menu workaround // url = rel.match(/(profile).?([^&#]+)/); // } showLogo = 1; diff --git a/static/css/aowow.css b/static/css/aowow.css index f292bdc4..f9429e75 100644 --- a/static/css/aowow.css +++ b/static/css/aowow.css @@ -3281,7 +3281,7 @@ a.button-red i { left: -1px; top: 2px; z-index: 1; - /* font-style: normal; sarjuuk: breaks textShadow*/ + /* font-style: normal; aowow: breaks textShadow*/ color: black; } @@ -3976,9 +3976,9 @@ div.captcha-center { } -/**************************************************/ -/* sarjuuk: deprecated stuff that might be of use */ -/**************************************************/ +/************************************************/ +/* aowow: deprecated stuff that might be of use */ +/************************************************/ .pet-model { diff --git a/static/css/locale_dede.css b/static/css/locale_dede.css index 1f67b8f6..6004c159 100644 --- a/static/css/locale_dede.css +++ b/static/css/locale_dede.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/dede/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/dede/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/dede/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 71px; diff --git a/static/css/locale_enus.css b/static/css/locale_enus.css index dc8952d5..9e5d204a 100644 --- a/static/css/locale_enus.css +++ b/static/css/locale_enus.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/enus/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/enus/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/enus/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 61px; diff --git a/static/css/locale_eses.css b/static/css/locale_eses.css index 0aa7aa60..2fd01db7 100644 --- a/static/css/locale_eses.css +++ b/static/css/locale_eses.css @@ -3,18 +3,6 @@ width, left, background-position values may need adjustment! */ -.topbar-search input.search-database { - background: white url(../images/eses/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/eses/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/eses/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 70px; @@ -111,4 +99,3 @@ a:hover.screenshotviewer-close span { width: 500px !important; } */ - \ No newline at end of file diff --git a/static/css/locale_frfr.css b/static/css/locale_frfr.css index 7e18b9a9..46ba8b21 100644 --- a/static/css/locale_frfr.css +++ b/static/css/locale_frfr.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/frfr/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/frfr/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/frfr/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 61px; @@ -106,4 +94,3 @@ a:hover.screenshotviewer-close span { width: 550px !important; } */ - \ No newline at end of file diff --git a/static/css/locale_ruru.css b/static/css/locale_ruru.css index 70614368..d9891b9b 100644 --- a/static/css/locale_ruru.css +++ b/static/css/locale_ruru.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/ruru/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/ruru/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/ruru/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 76px; @@ -106,4 +94,3 @@ a:hover.screenshotviewer-close span { width: 625px !important; } */ - \ No newline at end of file diff --git a/static/images/dede/searchdatabase.gif b/static/images/dede/searchdatabase.gif deleted file mode 100644 index 31b27405147477a289605e4e77a85e320ba23c76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmV+*0^j{dNk%w1VV3|30K@lEi zti8RxteLE=z2DEQA^8LV00000EC2ui0G9v?000I5V2}_bVE|~Vt}Gi2LMx|lJfrn3 z=XwwDz90_~VeDYRA2Nws-hfFcb0wX&fCq(*>g-j$-QzYIwl>FRmlNSA01hP!kw9^a z==Q;dWPI&SC~zbeN`HMw4}dCy956XG0UjM%cYrS$BqsognMyH_BbEc0ig$H|d|+D> z5(Y#k2X#4YZdn2%Mz$h^wy$rp3AvOowp0sl6~mv72`9dg3B1a0(>2e`(gL*9x53;x zK&+Z5v^fV25CGx<$DZtN;wt6skfT~G4}|VWknQK`H0U{MM}r?RbSmC?`lqgy!Y>Ke zwD}QA77{@v3_Nm#gjJu41vYkT@WIH6eB>~l+%mW_#sh=}mwgI#Najm`XBL*oBodsH ze+tW8gqgD+JcsRs%Ct67#m#+7hvM`^HDE}V3}Y@NN)@730KSSG>p7r-mdnv|?o`)L)i<@E|6jSR-U4L`|x+xxXQrr9|+!`pE+~pnls%`{&m{#O~h*irwG4 zcjlVCGxzSj{~sg=WC69zoC#DqbIp06auA%kcg^0tdx6qGjX<>^&P<>w@BhCC8Nc^D z0}X)UPZqGLIv^6{CkD3v4h;n!I#T^7mK2@Lv6_EjMTytisP#txNt!w+us*bA_xw<~kKB2BwvUcJ*f8^a~5cgp*T_R8OrrfyxX&b9yA ThUC+AO6#t@xn0%7z+epk?VWLFCMtYt938ya#Dpvlk?{cMS*w#X&3}1vK*g{k`x1-@ku; z&E7TVXYK_W^?uFX^9Ppx!RkTJ*2VTuPrD}LYkkk z#YKQoPCkV#zlBLgR)oiSdOrhG??Q$=5h*@~1uYzX`JAg~EQ(()r7q4W# zWG!Li{8V@MEf3S{-yDKmJBk9{OEH+Ta8*eP7Cew_{db4A@Uz;zJwZzLp7flw`6UMa;>#Q2`ID7|8@%uScL@i_|6y}VsI!B z*mA`#$BDh8Vapev;8`}ueORuY6$xFIzo=`a~Ic0CuwsU^@ zQMEzRhl5VcW1Aay$amM4_1pHe?e!52`s$suBf7m%<;<0Y@J$6TSA??aIXty`XeK0} zBmORV&(AKMCLaBVd+O#X+<7dqvoUbTf0ILDQrVfeOZSNHD*lnW{mrg}J1(8{75MS7 zpYe2+VxV4Q>|MFx@}#Rm z(@$O1`}^{)__U0JAKK68FfEwCZ9LOa`K;dU7e?1~oLzQw2fd!S@S4R0MhT_M1q%C$ lPY4-B1|~_W_pNx;6~5yTuc)5iVb`8%8#5LQIWjO<0|4UrT8#hz diff --git a/static/images/enus/searchdatabase.gif b/static/images/enus/searchdatabase.gif deleted file mode 100644 index f9aaccc25926f93488d6d004eea45b31eef49ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmZ?wbhEHb%w^zWIKsg2|NsA)GiUyPfByde|L5QTUo&&>|NDFQ0y+QhpI-x%Spy{Y z&Rp~V|9c?4W+qVn{>(K%g+Nt6@tN<>uL1JboWFk_$N=iQzZXQ!+zV9700xRbS-`Xo zhy>Zm!1`a|f{G(2W5%j=I@%)6yZ3F(xm>nx`(;hFeRuhmE1yd+T3m3_$$&#s^>V9D zSifmj*(q7p&?Z+0Mpg;0#>okn3waJLWqz=WbJ>5{sr68zic;60d z2H{(w-loe%_*7>*xa|5V@k!Kh+AOgL(Uz;8dP>OVzn#(0CSzf#>=olt&~U=v|MeW% nQ_RX44GYZj7o diff --git a/static/images/enus/searchwithinresults.gif b/static/images/enus/searchwithinresults.gif deleted file mode 100644 index 69b8118ed24454fc29da712a46de3585bea15dc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmZ?wbhEHbEMVYZxXQrr9|+!`U$f@?`~UxE&YTIPfIOhk{r~@gqVIv6^Y3Tw1@i9C zoVj=An)Cnf?_INI?-~$iFOb>`)B+^$|6en64N&?%5YOEE9;E0zP#w^)HG6?dfZ`ze zHRtaGHQhhIhJkuO@h1z|FdYyH@)HBwe+PyZhdm5^Czcdd@^G-7(KvAOCC{7-&w@|A z4O)9QC82pn5?7+0+1exPZhlxAyfJnEL^h?zGt}QO3ySb@Fbc6WH;B|FMN3t)bFy}_ z@N+eG7b}Q%dvrF}_KUf22m4Q$G@W055zCSosrJ;R0c_k6yuvN%47`#VY&?wVJ2o*a z=auu%V=4(hyt6pv$lTr8Tet4n7qPt9|Hj^oSYFZjE>*#8ij$(tZ%_2xD!{G8dgE^R zvWef9&yB9FYPHxIeO>2)oW=DR*+v77JG07u9?CQ~cP<@U z2i% zEcsK++I4-Ikf_Tnla>tiJ?zX8yA}mGrbpDOo)=piJXKY2g8^sHhYfwsH$(H;1#ZvQ I=3uY}0AKRvdH?_b diff --git a/static/images/enus/searchwithinresults2.gif b/static/images/enus/searchwithinresults2.gif deleted file mode 100644 index 447d6bde302019fcc42d8f9184d3a2aa62065a27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmZ?wbhEHbT*$z~aFv1KKM=e>zh=$(nKNg;|NsB|dk_yOwC4Q#nS1X8CGLY%+<*W6 z{QvuVXRbNF_x}GiKnjRw&IAeog=Ws&yLTp#+Ph{Akg*p;0matreGk<2|2>Gc<~+zC zh~(b;@9*!u4^#vMd(Q)97$^gZKUu&A=zvI&pBUKwJ2Vt{=t%XSSW;-qQW^WHW$tDlV{gGXv!Jp+$uDH~@U z>+>3?5+3Q6pMB}|pL?r6w^>vi@Solh|K{G8?CTmm`)#i(tWh-I@L)nk?J-4#?R|-6 z=DeH*J||iZwr0j?d}U;Hnl53PAr|TMfZ<>#lZ^8*7R`kDK41G*RW+@;vfRbEvn4{T z!$U_^Z9$%1Uolty3JWI3@3o7bw#c|Q&J|kM_){>-O;A8)MaQbmIVa}tZ`#MAdQpRc z%fq)Nce)Pa@%6@xC+2jV5s599`@VAF>?4jA%c|d9TJvPVQ>jVJwQjPP)S8zIR@_Q@ zx>7RgXhnjHfa>z}#t23=jqPtkH*0axV?4G$c@H@|EX@&>N)7M1?Wfn1X za(i6P5e?ne!Ps9LD+0kt~c1)&PuCKzjfH diff --git a/static/images/eses/searchdatabase.gif b/static/images/eses/searchdatabase.gif deleted file mode 100644 index 9e74f3436fa50a4f584e48966a3572cec77d7a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH0Nk%w1VX6QM0K@6tk0~O@Bjaqtk3`d@2t=7-@Tccz2Ci=nXJ9Ntk2)i&#b+fy{ymA ztgOAgteF4+00000A^8LV00000EC2ui0IC2A000I5V2}u;z!X5Lu59bRa2yar49vBy z!}y-|zF-Roa42%Zr1D0y5tq)U@2R3fnMlL}b?wTeJh0bg4I@|OCDBpAx*es%ZzPZd z45fB}(>bC?CrlY66D&P=ByDH}gLNs00*Y`Xb|NNRD~K0OmVqpqO^_7`7MC}GT$7GY zbR~s7IEP21ayYbiCn9z#S||obB89(awia>*o^x%(x5x#u1HE^CRShTiLo8p@{oV5z;}#W5pZRAj%VHP$NpIi$02p)h*zUZUp;zg<1fsi;?nhm~DX; zi&(2#YmD8PZfCq(Mh39FRd1NLlV_@;aQZ~89||yoZS#wGTwG~$6Ug}nSz8s!-i|QN z)ivBYjDd%=5qwe=ktOd62@Hd*8o5599&m*USW}TC*3Z7DViQ|Ns8``+I?+Gl9h3 z`)l?Bsq+lf28usfz((qTNRXcx*!~}Ia8|e=!f;|q(a9XE`6muEFszN59K_%G%EzGZ z`m!lf4GM=|m?W&pThBi2?pe>C%q_~nC|O#? zuq&10aC%@t+WuV(`y-B@+;wID4%VPTmP1Dbmmj-#Y47d5TZ+!z-P(RK!r3jSXItOh z2xj?@Li``5ZOBZ~STHZJ;K>yur(QpndWQBR$?mL*jM>?33{#p_4k_fxOboca{rTyA zb*to9gcb-%O`SN!gzNR!+^*wkFZF6GXB4G+=NfXIH84(Bn5UQhB*1Njcu}t;gOJFJ z<}}9G#zji$s>y7jjA5xkt#Ye98=hZcdUB|D>n~BY$x$v*>#{;0TwdA3Waq_In5aCx udi$~qiZ?x$-rfH#NVe_NsnBWM!ZvT-u3qzT^^T2yX6*7fGjp>7gEatfEc#IZ diff --git a/static/images/eses/searchwithinresults2.gif b/static/images/eses/searchwithinresults2.gif deleted file mode 100644 index 703f8a245e1d74e9085099caa51b752d52a013fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 712 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 XkzpX`-d$f`Uz;=KVf$ZC0S0RTSVbP+ diff --git a/static/images/ruru/searchwithinresults2.gif b/static/images/ruru/searchwithinresults2.gif deleted file mode 100644 index 8c4b5a555282f19ae3b731b20ae9db9496f22aa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 798 zcmZ?wbhEHbJj1}vaFv1KKM=e>KXc~H_y7N&fB%2Yn)4w3nl=Cb-(Pe7{mi}h@9&)n zyT5nu{r_u#O4pp<3&d+??ghe`Yd{#p0P^;(*?WJ@n!WGu?_D!<&3mA>y+9-1 z@4f$i4ba^CKsHcf&HeZ1_pUjA{yotA^9&RN#h)x-Gju>C$WIJx{~a0%JanY`Pb?`q znPWBo!ithtJR)p|U0J-}`pGgmwq7um37FDWel|~iZOn&jzV=FfcXrjCPd~)SA)*$} zz$m~Z!CMf;%#+B~mYB#{?>e#HwU22^`y@_=S@Zcc#b&q43ol#H&n6tr!?||-jDj?l zt?b)dTElzR&Ua#5v1%3)k3NTeb1UMTQt&_B*Q$7qJ?S5iQ(BTmt+X1i^*OLf VvidsdIW7@O*b|~6?8v}i4FG&&VkQ6p diff --git a/static/js/Profiler.js b/static/js/Profiler.js index a8f4883c..6430187e 100644 --- a/static/js/Profiler.js +++ b/static/js/Profiler.js @@ -2380,7 +2380,7 @@ function ProfilerTalents(_parent) { } if (!_displayed) { - // sarjuuk: causes infinite loop and it works fine without this + // aowow: causes infinite loop and it works fine without this // _talentCalc.setLevelCap(_profile.level); if (_mode != 'pets') { _updateBuilds(); @@ -4600,7 +4600,7 @@ function ProfilerInventory(_parent) { }; var params = { - wmode: 'direct', // sarjuuk: was 'opaque'; doesn't draw with this + wmode: 'direct', // aowow: was 'opaque'; doesn't draw with this quality: 'high', allowscriptaccess: 'always', allowfullscreen: true, @@ -4617,7 +4617,7 @@ function ProfilerInventory(_parent) { _mvInited = true; } - else { /* sarjuuk: the idea of this is to directly access the swf. it just doesn't work with the ZAMviewerfp11.swf */ + else { /* aowow: the idea of this is to directly access the swf. it just doesn't work with the ZAMviewerfp11.swf */ _swfModel = $WH.ge(_swfModel.id); if (_swfModel.clearSlots) { @@ -7388,7 +7388,7 @@ function ProfilerCompletion(_parent) { return _timer[wut] = setTimeout(_self.filterData.bind(_self, wut, value), 750); } - if (!_divTotals) // sarjuuk: prevent error on matching available data against empty known data + if (!_divTotals) // aowow: prevent error on matching available data against empty known data return; var _ = 0; @@ -7513,7 +7513,7 @@ function ProfilerCompletion(_parent) { } if ((!_opt.compute || _opt.compute(row, data[i])) && data[i]) { - // row.completed = (data[i].getTime ? data[i] : (_opt.showQuantity ? data[i] : 1)); // sarjuuk: idk a way to generate a jScript-TimeObject in php (there probably isn't), but one is expected here + // row.completed = (data[i].getTime ? data[i] : (_opt.showQuantity ? data[i] : 1)); // aowow: idk a way to generate a jScript-TimeObject in php (there probably isn't), but one is expected here row.completed = (data[i] > 946681200 ? new Date(data[i] * 1000) : (_opt.showQuantity ? data[i] : 1)); // so we create a dateObject from data[i] if it is a unixtime past the 1.1.2000 - 0:00 (wich probably isn't used as a sensible int anyway) hasData = true; } diff --git a/static/js/ShowOnMap.js b/static/js/ShowOnMap.js index 2173a51b..52ab3de6 100644 --- a/static/js/ShowOnMap.js +++ b/static/js/ShowOnMap.js @@ -395,7 +395,7 @@ ShowOnMap.prototype.construct = function() { } } } - if (menu && menu[2] && menu[2].constructor && menu[2].call && menu[2].apply) { // sarjuuk: check if menu[2] is function + if (menu && menu[2] && menu[2].constructor && menu[2].call && menu[2].apply) { // aowow: check if menu[2] is function menu[2](); } } diff --git a/static/js/Summary.js b/static/js/Summary.js index 3ab79a13..f8e9ff59 100644 --- a/static/js/Summary.js +++ b/static/js/Summary.js @@ -94,7 +94,7 @@ function Summary(opt) { } var GET = $WH.g_getGets(); - /* sarjuuk: GET.compare => GET.items, when using flat urls */ + /* aowow: GET.compare => GET.items, when using flat urls */ this.autoSave = 1; if (GET.compare) { @@ -1413,7 +1413,7 @@ Summary.prototype = { var href ='?compare'; if (groups) { - href += '=' + groups; // sarjuuk - with fixed urls: href += '?items=' + groups; + href += '=' + groups; // aowow - with fixed urls: href += '?items=' + groups; if (level != 80) { href += '&l=' + level; @@ -3181,7 +3181,7 @@ Summary.prototype = { case 13: // Enter g_listviews.items.submitSearch(e); break; -/* sarjuuk todo: internal misconception ... hide() and cycle(dir) are members of Livesearch and cant be reused here without further adaptation +/* aowow todo: internal misconception ... hide() and cycle(dir) are members of Livesearch and cant be reused here without further adaptation case 27: // Escape hide(); break; diff --git a/static/js/basic.js b/static/js/basic.js index aff4535c..0477f784 100644 --- a/static/js/basic.js +++ b/static/js/basic.js @@ -1045,7 +1045,7 @@ $WH.g_intersectRect = function(a, b) { //****************************************************************************// //****************************************************************************// -// sarjuuk: this function should be obsolete by now :x +// aowow: this function should be obsolete by now :x $WH.g_setRatingLevel = function(sp, level, rating, value) { var newLvl = prompt($WH.sprintf(LANG.prompt_ratinglevel, 1, 80), level); if (newLvl != null) { @@ -1378,7 +1378,7 @@ $WH.g_setTooltipLevel = function(tooltip, level) { } // Always keep the base armor type - return $WH.isset('g_itemset_types') ? prefix + g_itemset_types[_] : _all; // sarjuuk: LANG is not available if the tooltip is included externaly + return $WH.isset('g_itemset_types') ? prefix + g_itemset_types[_] : _all; // aowow: LANG is not available if the tooltip is included externaly // return prefix + g_itemset_types[_]; }); @@ -1461,7 +1461,7 @@ $WH.g_setTooltipLevel = function(tooltip, level) { // Rating to percent nMatch = []; tooltip = tooltip.replace(/()([\.0-9]+)/g, function(_all, prefix, ratingId, percent) { -/* sarjuuk: fix tooltips with multiple occurences of the same rating +/* aowow: fix tooltips with multiple occurences of the same rating _ = tooltip.match(new RegExp('(\\d+)')); if (!_) { return _all; diff --git a/static/js/global.js b/static/js/global.js index 4e41e1b2..15c7ad4e 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -404,7 +404,7 @@ var PageTemplate = new function() initFeedbackLink(); initLanguageMenu(); - initFilterDisclosure(); // sarjuuk: custom (visibility toggle for filters was removed at some point) + initFilterDisclosure(); // aowow: custom (visibility toggle for filters was removed at some point) // UI before page contents initFloatingStuff(); @@ -644,7 +644,7 @@ var PageTemplate = new function() var menuItem = [ locale.id, locale.description, - g_host + '/?locale=' + locale.id, // sarjuuk: edited for unsupported subdomains # linkBefore + locale.domain + linkAfter + g_host + '/?locale=' + locale.id, // aowow: edited for unsupported subdomains # linkBefore + locale.domain + linkAfter null, // more custom null // also custom ]; @@ -718,26 +718,9 @@ var PageTemplate = new function() // Search var $search = $('div.topbar-search', $topBar); - // custom start (note: html5 supports placeholder attribute) - var inp = $WH.ge('livesearch-generic'); - if (inp.value == '') { - inp.className = 'search-database'; - } - inp.onmouseover = function() { - if ($WH.trim(this.value) != '') { - this.className = ''; - } - }; - inp.onfocus = function() { - this.className = ''; - }; - inp.onblur = function() { - if ($WH.trim(this.value) == '') { - this.className = 'search-database'; - this.value = ''; - } - }; - // custom end + // aowow: custom start + $('#livesearch-generic').attr('placeholder', LANG.searchdb); + // aowow: custom end // Icon var $icon = $('').attr('href', 'javascript:;'); @@ -1469,7 +1452,7 @@ function g_getMoneyHtml(money, side, costItems, costCurrency, achievementPoints) side = 1; } - // sarjuuk: custom start + // aowow: custom start if (currencyId == 103) { // arena html += '' + $WH.number_format(count) + ''; } @@ -1479,7 +1462,7 @@ function g_getMoneyHtml(money, side, costItems, costCurrency, achievementPoints) else { // tokens html += '' + count + ''; } - // sarjuuk: custom end + // aowow: custom end // html += '' + (side == 3 ? '' : '') + count + (side == 3 ? '' : '') + ''; } } @@ -3682,6 +3665,10 @@ var } } + if (field.placeholder) { + f.placeholder = field.placeholder; + } + if (field.type != 'checkbox' && field.type != 'radio') { if (field.width) { f.style.width = field.width; @@ -5420,12 +5407,12 @@ Listview.prototype = { $WH.ae(bandTop, this.navTop); if (this.searchable) { var - FI_FUNC = this.updateFilters.bind(this, true), - FI_CLASS = (this._truncated ? 'search-within-results2' : 'search-within-results'), - sp = $WH.ce('span'), - em = $WH.ce('em'), - a = $WH.ce('a'), - input = $WH.ce('input'); + FI_FUNC = this.updateFilters.bind(this, true), + FI_PH = (this._truncated ? LANG.lvsearchdisplayedresults : LANG.lvsearchresults), + sp = $WH.ce('span'), + em = $WH.ce('em'), + a = $WH.ce('a'), + input = $WH.ce('input'); sp.className = 'listview-quicksearch'; @@ -5439,7 +5426,7 @@ Listview.prototype = { a.onclick = function() { var foo = this.nextSibling; foo.value = ''; - foo.className = FI_CLASS; + foo.placeholder = FI_PH; FI_FUNC(); }; a.style.display = 'none'; @@ -5448,7 +5435,7 @@ Listview.prototype = { $WH.ns(a); input.setAttribute('type', 'text'); - input.className = FI_CLASS; + input.placeholder = FI_PH; input.style.width = (this._truncated ? '19em': '15em'); g_onAfterTyping(input, FI_FUNC, this.searchDelay); @@ -5464,7 +5451,6 @@ Listview.prototype = { input.onblur = function() { if ($WH.trim(this.value) == '') { - this.className = FI_CLASS; this.value = ''; } }; @@ -7322,7 +7308,7 @@ Listview.extraCols = { } // var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 0 : (row.percent >= 0.195 ? 1 : 2))); - var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 1 : 2)); // sarjuuk: doesn't look as nice but i prefer accuracy + var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 1 : 2)); // aowow: doesn't look as nice but i prefer accuracy if (row.pctstack) { var sp = $WH.ce('span'); @@ -8595,7 +8581,7 @@ Listview.funcBox = { Listview.templates.comment.updateCommentCell(comment); comment.deleted = true; - // sarjuuk: lets see.... + // aowow: custom start comment.voteCell.hide(); comment.repliesCell.hide(); comment.commentBody.hide(); @@ -8615,7 +8601,7 @@ Listview.funcBox = { comment.repliesControl.toggle(); }); } - // nothing more to see here + // aowow: custom end return; } @@ -8641,7 +8627,7 @@ Listview.funcBox = { comment.deleted = false; Listview.templates.comment.updateCommentCell(comment); - // sarjuuk: lets see.... + // aowow: custom start comment.voteCell.show(); comment.repliesCell.show(); comment.commentBody.show(); @@ -8651,7 +8637,7 @@ Listview.funcBox = { comment.headerCell.css('cursor', 'auto'); comment.headerCell.unbind('click'); } - // nothig mor to see here + // aowow custom end } } else @@ -8661,7 +8647,7 @@ Listview.funcBox = { coEdit: function(comment, mode, blog) { - // sarjuuk: already editing + // aowow: custom if (comment.commentCell.find('.comment-edit')[0]) { return; } @@ -9406,7 +9392,7 @@ Listview.funcBox = { moneyCurrencyOver: function(currencyId, count, e) { var buff = g_gatheredcurrencies[currencyId]['name_' + Locale.getName()]; - // sarjuuk: justice / valor points handling removed + // aowow: justice / valor points handling removed $WH.Tooltip.showAtCursor(e, buff, 0, 0, 'q1'); }, @@ -9504,7 +9490,7 @@ Listview.funcBox = { icon = g_gatheredcurrencies[currencyId].icon; } -// sarjuuk: replacement +// aowow: replacement _ = $WH.ce('a'); _.href = '?currency=' + currencyId; _.onmousemove = $WH.Tooltip.cursorUpdate; @@ -9537,7 +9523,7 @@ Listview.funcBox = { _.onmouseover = Listview.funcBox.moneyCurrencyOver.bind(_, currencyId, count); $WH.ae(_, $WH.ct($WH.number_format(count))); } -/* sarjuuk: original +/* aowow: original if (side == 3 && icon[0] == icon[1]) { side = 1; } @@ -12064,7 +12050,7 @@ Listview.templates = { return buff; }, sortFunc: function(a, b) { - /* sarjuuk: behaves unpredictable if reqclass not set or 0 + /* aowow: behaves unpredictable if reqclass not set or 0 if (a.reqclass && b.reqclass) { var reqClass = $WH.strcmp(g_chr_classes[(1 + Math.log(a.reqclass) / Math.LN2)], g_chr_classes[(1 + Math.log(b.reqclass) / Math.LN2)]); if (reqClass) { @@ -12107,7 +12093,7 @@ Listview.templates = { return Listview.funcBox.assocArrCmp(a.skill, b.skill, g_spell_skills); } }, - /* sarjuuk + /* aowow todo: localize he next three cols */ { @@ -12902,7 +12888,7 @@ Listview.templates = { comment.headerCell.css('cursor', 'pointer'); comment.headerCell.bind('click', function(e) { if ($WH.$E(e)._target.nodeName == 'A') { - return; // sarjuuk - custom: prevent toggle if using function buttons + return; // aowow - custom: prevent toggle if using function buttons } comment.voteCell.toggle(); @@ -13773,7 +13759,7 @@ Listview.templates = { getItemLink: function(reply) { - /* sarjuuk: g_getCommentDomain returned a whole domain to ptr., old., ect. + /* aowow: g_getCommentDomain returned a whole domain to ptr., old., ect. if(reply.url) return g_getCommentDomain(reply.domain) + '/' + reply.url; if(!g_types[reply.type]) @@ -15310,7 +15296,7 @@ Listview.templates = { var a = $WH.ce('a'); a.href = 'javascript:;'; - // a.className = 'pet-zoom'; // sarjuuk: keep as reference only + // a.className = 'pet-zoom'; // aowow: keep as reference only a.onclick = this.template.modelShow.bind(this.template, model.npcId, model.displayId, false); var img = $WH.ce('img'); @@ -16758,12 +16744,12 @@ function MessageBox(parent, text) { box.addClass("message-box"); box.html('

' + text + '

(Click on this box to close it)

'); - setTimeout(function() { // sarjuuk - custom: popups that never vanish are just insane + setTimeout(function() { // aowow - custom: popups that never vanish are just insane box.fadeOut(); }, 5000); box.click(function (e) { - $WH.sp(e); // sarjuuk - custom: without this, the comment-header would also register the click + $WH.sp(e); // aowow - custom: without this, the comment-header would also register the click $(this).fadeOut(); }); @@ -18590,7 +18576,7 @@ Mapper.prototype = { this.sZoom.style.display = 'none'; } - /* sarjuuk: check for e is custom as it should only affect the lightbox */ + /* aowow: check for e is custom as it should only affect the lightbox */ if(this.zoom && e === undefined) MapViewer.show({ mapper: this }); }, @@ -18980,7 +18966,7 @@ Mapper.prototype = { } }; -/* sarjuuk: already defined in locale_xx instead of being fetched later +/* aowow: already defined in locale_xx instead of being fetched later var g_zone_areas = {}; */ diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index 6eb69a76..a77c2402 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -2487,6 +2487,8 @@ var LANG = { male: "Mann", female: "Frau", + searchdb: "Datenbank durchsuchen...", + source_bossdrop: "Bossdrop", source_zonedrop: "Gebietsdrop", source_quests: "Quests", @@ -2568,6 +2570,9 @@ var LANG = { lvpage_next: "Nächste ", lvpage_last: "Letzte ", + lvsearchresults: "In Ergebnissen suchen...", + lvsearchdisplayedresults: "In angezeigten Ergebnissen suchen...", + lvscreenshot_submit: "Einen Screenshot einsenden", lvscreenshot_from: "Von ", lvscreenshot_hires: "Ansicht", diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 96f76aa4..9039ba4b 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -1650,7 +1650,7 @@ var g_sources = { 10: 'Starter', 11: 'Event', 12: 'Achievement', - // sarjuuk: 13 is string from serverside table, used by titles + // aowow: note - 13 is string from serverside table, used by titles 14: 'Black Market', 15: 'Disenchanted', 16: 'Fished', @@ -2534,6 +2534,8 @@ var LANG = { male: "Male", female: "Female", + searchdb: "Search database...", + source_bossdrop: "Boss Drop", source_zonedrop: "Zone Drop", source_quests: "Quests", @@ -2615,6 +2617,9 @@ var LANG = { lvpage_next: "Next ", lvpage_last: "Last ", + lvsearchresults: "Search within results...", + lvsearchdisplayedresults: "Search within displayed results...", + lvscreenshot_submit: "Submit a screenshot", lvscreenshot_from: "From ", lvscreenshot_hires: "View", diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index 8f6f45f4..a24fa184 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -2487,6 +2487,8 @@ var LANG = { male: "Hombre", female: "Mujer", + searchdb: "Buscar en la Base de Datos...", + source_bossdrop: "Botín de Jefe", source_zonedrop: "Despojo de zona", source_quests: "Misiones", @@ -2568,6 +2570,9 @@ var LANG = { lvpage_next: "Siguiente ", lvpage_last: "Última ", + lvsearchresults: "Buscar en resultados", + lvsearchdisplayedresults: "Buscar en los resultados mostrados", + lvscreenshot_submit: "Envia una captura de pantalla", lvscreenshot_from: "Desde ", lvscreenshot_hires: "Ver", diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index cc7297c8..d9edcee2 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -2477,6 +2477,8 @@ var LANG = { male: "Homme", female: "Femme", + searchdb: "Rechercher dans la base de données...", + source_bossdrop: "Butin de Boss", source_zonedrop: "Butin de zone", source_quests: "Quêtes", @@ -2558,6 +2560,9 @@ var LANG = { lvpage_next: "Suiv. ", lvpage_last: "Dernière ", + lvsearchresults: "Rechercher parmi les résultats...", + lvsearchdisplayedresults: "Rechercher parmi les résultats affichés...", + lvscreenshot_submit: "Envoyer une capture d'écran", lvscreenshot_from: "Par ", lvscreenshot_hires: "Voir", diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index debb597a..8edfa355 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -2477,6 +2477,8 @@ var LANG = { male: "Мужчина", female: "Женщина", + searchdb: "Искать в Базе Данных...", + source_bossdrop: "Добыча с боссов", source_zonedrop: "Добыча на территории", source_quests: "Задания", @@ -2558,6 +2560,9 @@ var LANG = { lvpage_next: "Далее ", lvpage_last: "Конец ", + lvsearchresults: "Поиск в результатах", + lvsearchdisplayedresults: "Поиск в показанных результатах", + lvscreenshot_submit: "Отправить изображение", lvscreenshot_from: "От ", lvscreenshot_hires: "Просмотр", diff --git a/static/js/screenshot.js b/static/js/screenshot.js index d13821bc..08486484 100644 --- a/static/js/screenshot.js +++ b/static/js/screenshot.js @@ -170,14 +170,14 @@ function ssm_ColorizeRow(color) { } function ssm_ConfirmMassApprove() { - ajaxAnchor(this); // sarjuuk custom - there has to be something in place or we are manually using a script for ajax + ajaxAnchor(this); // aowow custom - there has to be something in place or we are manually using a script for ajax return false; // return true; } function ssm_ConfirmMassDelete() { - if (confirm('Delete selected screenshot(s)?')) // sarjuuk custom - see above + if (confirm('Delete selected screenshot(s)?')) // aowow custom - see above ajaxAnchor(this); return false; @@ -185,7 +185,7 @@ function ssm_ConfirmMassDelete() { } function ssm_ConfirmMassSticky() { - if (confirm('Sticky selected screenshot(s)?')) // sarjuuk custom - see above + if (confirm('Sticky selected screenshot(s)?')) // aowow custom - see above ajaxAnchor(this); return false; @@ -542,7 +542,7 @@ function ssm_ShowEdit(screenshot, isAlt) { iCaption.value = screenshot.caption; iCaption.maxLength = 200; iCaption.size = 35; - iCaption.onclick = function (e) { $WH.sp(e); } // sarjuuk - custom to inhibit screenshot popup, when clicking into input element + iCaption.onclick = function (e) { $WH.sp(e); } // aowow - custom to inhibit screenshot popup, when clicking into input element div.appendChild(iCaption); var btn = $WH.ce('input');