From 39c71ce4a92a37f88465f9bad6f405b960d49c12 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 17 Oct 2018 20:04:22 +0200 Subject: [PATCH] Minor improvements, removed unused assets --- README.md | 4 +- __resource.lua | 5 +- client/main.lua | 31 ++-------- html/css/app.css | 95 +++++++++++++++--------------- html/img/accounts/bank.png | Bin 1015 -> 0 bytes html/img/accounts/black_money.png | Bin 1030 -> 0 bytes html/img/cursor.png | Bin 272 -> 0 bytes html/img/keys/enter.png | Bin 941 -> 0 bytes html/img/keys/return.png | Bin 376 -> 0 bytes html/js/app.js | 44 +++++++------- html/ui.html | 24 ++++---- 11 files changed, 90 insertions(+), 113 deletions(-) delete mode 100644 html/img/accounts/bank.png delete mode 100644 html/img/accounts/black_money.png delete mode 100644 html/img/cursor.png delete mode 100644 html/img/keys/enter.png delete mode 100644 html/img/keys/return.png diff --git a/README.md b/README.md index 62c42769..7a2235e4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# fxserver-esx_menu_default -FXServer ESX Menu Default +# esx_menu_default +ESX Menu Default diff --git a/__resource.lua b/__resource.lua index eec9c5df..43bb03aa 100644 --- a/__resource.lua +++ b/__resource.lua @@ -19,10 +19,7 @@ files { 'html/js/mustache.min.js', 'html/js/app.js', 'html/fonts/pdown.ttf', - 'html/fonts/bankgothic.ttf', - 'html/img/cursor.png', - 'html/img/keys/enter.png', - 'html/img/keys/return.png', + 'html/fonts/bankgothic.ttf' } dependencies { diff --git a/client/main.lua b/client/main.lua index 984da0b5..5a482921 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,7 +1,6 @@ ESX = nil Citizen.CreateThread(function() - while ESX == nil do TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.Wait(0) @@ -24,7 +23,6 @@ Citizen.CreateThread(function() local MenuType = 'default' local openMenu = function(namespace, name, data) - SendNUIMessage({ action = 'openMenu', namespace = namespace, @@ -35,7 +33,6 @@ Citizen.CreateThread(function() end local closeMenu = function(namespace, name) - SendNUIMessage({ action = 'closeMenu', namespace = namespace, @@ -52,25 +49,20 @@ Citizen.CreateThread(function() if menu.submit ~= nil then menu.submit(data, menu) end - end) AddEventHandler('esx_menu_default:message:menu_cancel', function(data) - local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) if menu.cancel ~= nil then menu.cancel(data, menu) end - end) AddEventHandler('esx_menu_default:message:menu_change', function(data) - local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) - + for i=1, #data.elements, 1 do - menu.setElement(i, 'value', data.elements[i].value) if data.elements[i].selected then @@ -84,81 +76,68 @@ Citizen.CreateThread(function() if menu.change ~= nil then menu.change(data, menu) end - end) Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) if IsControlPressed(0, Keys['ENTER']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - SendNUIMessage({ action = 'controlPressed', control = 'ENTER' }) GUI.Time = GetGameTimer() - end if IsControlPressed(0, Keys['BACKSPACE']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - SendNUIMessage({ action = 'controlPressed', control = 'BACKSPACE' }) GUI.Time = GetGameTimer() - end - if IsControlPressed(0, Keys['TOP']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - + if IsControlPressed(0, Keys['TOP']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 200 then SendNUIMessage({ action = 'controlPressed', control = 'TOP' }) GUI.Time = GetGameTimer() - end - if IsControlPressed(0, Keys['DOWN']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - + if IsControlPressed(0, Keys['DOWN']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 200 then SendNUIMessage({ action = 'controlPressed', control = 'DOWN' }) GUI.Time = GetGameTimer() - end if IsControlPressed(0, Keys['LEFT']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - SendNUIMessage({ action = 'controlPressed', control = 'LEFT' }) GUI.Time = GetGameTimer() - end if IsControlPressed(0, Keys['RIGHT']) and GetLastInputMethod(2) and (GetGameTimer() - GUI.Time) > 150 then - SendNUIMessage({ action = 'controlPressed', control = 'RIGHT' }) GUI.Time = GetGameTimer() - end - end + end end) end) diff --git a/html/css/app.css b/html/css/app.css index 2739eada..84c72576 100644 --- a/html/css/app.css +++ b/html/css/app.css @@ -1,93 +1,94 @@ @font-face { - font-family: bankgothic; - src: url('../fonts/bankgothic.ttf'); + font-family: bankgothic; + src: url('../fonts/bankgothic.ttf'); } @font-face { - font-family: pcdown; - src: url('../fonts/pdown.ttf'); + font-family: pcdown; + src: url('../fonts/pdown.ttf'); } + .menu { - font-family: bankgothic; - min-width : 400px; - color : #fff; - box-shadow : 0px 0px 50px 0px #000; - position : absolute; + font-family: bankgothic; + min-width: 400px; + color: #fff; + box-shadow: 0px 0px 50px 0px #000; + position: absolute; } .menu.align-left { - left: 40; - top : 50%; - transform: translate(0, -50%); + left: 40; + top: 50%; + transform: translate(0, -50%); } .menu.align-top-left { - left: 40; - top : 40; + left: 40; + top: 40; } .menu.align-top { - left: 50%; - top : 40; - transform: translate(-50%, 0); + left: 50%; + top: 40; + transform: translate(-50%, 0); } .menu.align-top-right { - right: 10; - top : 40; + right: 10; + top: 40; } .menu.align-right { - right: 40; - top : 50%; - transform: translate(0, -50%); + right: 40; + top: 50%; + transform: translate(0, -50%); } .menu.align-bottom-right { - right : 40; - bottom: 40; + right: 40; + bottom: 40; } .menu.align-bottom { - left : 50%; - bottom: 40; - transform: translate(-50%, 0); + left: 50%; + bottom: 40; + transform: translate(-50%, 0); } .menu.align-bottom-left { - left : 40; - bottom: 40; + left: 40; + bottom: 40; } .menu.align-center { - left : 50%; - top : 50%; - transform: translate(-50%, -50%); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); } .menu .head { - background-color: #506be6; - text-align : center; - height : 40px; - line-height : 40px; + background-color: #506be6; + text-align: center; + height: 40px; + line-height: 40px; } .menu .menu-items { - max-height : 600px; - overflow-y : auto; + max-height: 600px; + overflow-y: auto; } .menu .menu-items .menu-item { - height : 40px; - display : block; - background-color: #f1f1f1; - box-shadow : inset 1px 0px 0px 1px #b8b8b8; - height : 32px; - line-height : 32px; - color : #3A3A3A; - text-align : center; + height: 40px; + display: block; + background-color: #f1f1f1; + box-shadow: inset 1px 0px 0px 1px #b8b8b8; + height: 32px; + line-height: 32px; + color: #3A3A3A; + text-align: center; } .menu .menu-items .menu-item.selected { - background-color: #d0d0d0; + background-color: #d0d0d0; } \ No newline at end of file diff --git a/html/img/accounts/bank.png b/html/img/accounts/bank.png deleted file mode 100644 index eb36dc8e70242136858874dc04024f41a4a0ffe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1015 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZowVTiq@}o(XxOP=4eyC973P=U1kRsFroRJ#! z(58{#776h;aLEM;L{SeVNSr|QQXy1+3PCF$LRAh>$;D}$6yr9(+&K1ncOM65H{N(1 z#D$Kuhc`R(oq6-#%=d|SpP}3h7iYue{}eqbkx7XFRFr{CNQ8)Xb~jy=7uE?4gk`F&OBwm4 zCoMHTH>$?xM%AIWM*@A{$sTp={U_D<+^9-VTDxK-EK`kLJ+5RzDnM!ek$H}yvF_~J zI*(=_0U-a;0)z8Wb)S zQLZ90W&QVw7&*Bd#kDto4a&FO>rT+B>2t%_D-HHP*Nt0qx&3jG%#?*w*}g}u7*V?q zC7?WT9&9^T7ittfS!~IwsWS)S-1}*T;uj^>ZdO>nzDliBXXNxy;O7swHVm3ETF1EN z4>(O1#JYDsk>%W4c>Lb8d62J?Ix`%Uf2Yk(iFNB}y6}hU)_oQ5>d!CYZn)gNQs$4D zKRXVhm%qw}1`)u%qg{dS$JcVyN_M3G6VnGdaH2iso z*ZbP|p!QdtrOPGu48|kL$mfBbu>v}-m+cT8XD>e8k&fM(*Y<#MYaY*k@Ki@S_G~Xi l#{maD><5W>*iW*51^`FRlAF&_hJ*kB002ovPDHLkV1iBj&&U7( diff --git a/html/img/accounts/black_money.png b/html/img/accounts/black_money.png deleted file mode 100644 index a42f6aa5191115bd04d04a728fb3c3463e6f4345..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1030 zcmV+h1o``kP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZT+Hn2g&!y2+1h(>773hKd&LYji7 zJxDS2q!OyV*_F1(HYnsEh!-iPJ(ZSP4aAjfgeH{rV4AN*TFttfb$4bmZx7v>?##{# z?V&y}hv%8+>;1pa$1D1}yJgw3cww6SpVXsi=&FhUWSBxsRZ)ZpHLjQ@PC%vrF-;5A zcci3ZS)uWZC+3;63 zP5NhNQG_7k$iD&Ti^Y6K$y>Lur5_yG;D0)PoSwjGx9WA?yK@Hs5kM{?1izg=O;;2A zE;12U>4j-}Ke7u86iTH~$S#kLGN9`%@&R4v!+raho}Ul3%PuT1H9YLaYQ8!YA?Of- zVztV(#YN7~&4oJYkHxr{N_qVKVv+mBqQ_rKrRWbJ>C*YRIj$`(Qmj_#5W-hqGN!6> zV{%d^3_~`GGW5GJG9sN!Mmm{{ygWMU$&U>V%5RSxkxnKfFN}=5(nrED_VAxIbo05=N-zC3)GHzE;!+1%vw@o_Ie!Z2_5K&81r!?IKr zh1|)L^k^EFQYm)L%mA>fvlD<*LqnXsdzb!LjLmA5H@mvL+HiFMpO3e$U&jh*>&SnZ zV$Kc?zZa1REj@pHO6~;d1>2x z`tTvs=`>qSb=2%5?DW0_oIrm*E|tjU^S*KVxKv_5*ZFQ`g|C;En1A||AJ*1bt5o_1QC~4jk~{59$PIcV{Q6qIgLP zKq^8|I&+4yWpT4m;NyGu+76Wq2dk9|S8_RzKNyeuf?vty+6KQmHpaPRl6W-Aj+7n(5dsSW zU}|`nua=fVm(h*oWj@%uw`CvvUM_QEd6{>0J#-nldmtFgTgU5_if`vg<{vZ*r`$_iK0G#)*@UBUHMF0Q*07*qoM6N<$f`k9( AtN;K2 diff --git a/html/img/cursor.png b/html/img/cursor.png deleted file mode 100644 index 39536f953d701b36a90dc56084bafd988371a2fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYSkfJR9T^xl_H+M9WCij$3p^r= z85sBufiR<}hF1enP_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7uNxxqFzrI z#}Etut!FreS`>I(0^ikVp5f1PInc0ibrsXWO3z8Ee_BE>W<&%Ean9H1Y|@_Ma)5tI zP3vrppG@U}o4EJ`H!a-_TKCSz%v`zHX&3lrYRgJzbSuAt9 z@6PvoS_%Jm+&BGp_A+yZ?Fo&SwU@JtJ?kA`YTb#E`^&mC!8qZZWp1Mjt5em&H79@$ OWAJqKb6Mw<&;$S!<6)ox diff --git a/html/img/keys/enter.png b/html/img/keys/enter.png deleted file mode 100644 index 3eb9a1f69f58c651517329c92d28cdb1c605f165..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 941 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$Aj3=GUpo-U3d6>)E`8wN=`3bZEbov^iFaeu%P z(=cbwj44wlOz4rm5xb{;*Ri~}uR6cp(A&Mg;nJ7c^H#o^DiE{vT2%I1{SRyZiuLSP z%I`LO*R@CY*bePa+aw;ZJ8?S+Bq+DcEWq?az(jNYVCfZ787ofAZePh8!fO)pBkQX z_v_cMN3~tQ9xnRXb?ICkwaPbd-|8+sfB5~ocaKb5*$ZEQP2MMD?ps&IpveBkTdrZ6 zxw-l0$rY8AfmJN&5XWi1Tr~N;qpPCYQm=EdrvtPXJvz5h@~FDPw92D`R+fPvAFW@~ zU8c75`%1Gbh1a`Q>?qE0`*<(h^|W${-y)Ec<2}XS`n>x2)3WZB?5;)4TWYMP-*<76OIq zPp@4X%Z+C%*K#BUX=ORzsAov;Kl`m>i&y`Jz)nzj*Qmyplm-1%6v*YUbiCHwmEO<$ zF|Z@`-}HhOKR<9>X}?rT5Bm9ye^tw4euv}#-v4JmQzRDkY{|X*_d_{Xwfto_xNQ|y z-^Qlff58%JWZtYCU#*y5vIf?_WBTiPU(9hK5Tmx!-~Iodkpb3zr{Lwk`bljQz#(xy zvE05v9vtTHlU}QP{nuV*08Uf+$??{$l9IqgWxio$Zh{XeF$LeaxXn-#^iFnsKzTLkWYeXNfKEXTvUB0pJdzPZ}OMgdS+TyQ( lJso37+@RE7f9~qla<)GklNn{1`ISV`@iy0XBj({-ZRBb+Kpaxz~7srr_xVN`&cQqS`I9#;&|Ns0smZ-L@ zqu)%cbtmkrE=&Hfsn_t^{^k|)kLw3AbqG7mVR+;>`#|k>^_ZL6&QAQlndu0pf*(U6 zREkAFy}^PJuTYF$!{g|Ur7IbD{_6-gJlsE>3DGO)9eE;D=anIC*ESQi{xCV$~42}L!4TJCrkQD1~tJw zr&teYqgpL=o@s|#!;B|~71m*K { @@ -228,12 +228,12 @@ for(let i=0; i min){ elem.value--; - ESX_MENU.change(focused.namespace, focused.name, elem) + ESX_MENU.change(focused.namespace, focused.name, elem); } ESX_MENU.render(); @@ -335,12 +335,12 @@ if(typeof elem.options != 'undefined' && elem.value < elem.options.length - 1){ elem.value++; - ESX_MENU.change(focused.namespace, focused.name, elem) + ESX_MENU.change(focused.namespace, focused.name, elem); } if(typeof elem.max != 'undefined' && elem.value < elem.max){ elem.value++; - ESX_MENU.change(focused.namespace, focused.name, elem) + ESX_MENU.change(focused.namespace, focused.name, elem); } ESX_MENU.render(); @@ -368,12 +368,12 @@ } - } + }; window.onload = function(e){ window.addEventListener('message', (event) => { - onData(event.data) + onData(event.data); }); - } + }; -})() \ No newline at end of file +})(); \ No newline at end of file diff --git a/html/ui.html b/html/ui.html index c9363c07..af5fd03b 100644 --- a/html/ui.html +++ b/html/ui.html @@ -1,16 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + - \ No newline at end of file