Skip to content

Commit

Permalink
Merge pull request #609 from bitpredator/dev
Browse files Browse the repository at this point in the history
chore: esx_menu_default update to version 1.0.0
  • Loading branch information
bitpredator authored Jan 14, 2024
2 parents 6ee4228 + f0badb8 commit 07470d4
Show file tree
Hide file tree
Showing 9 changed files with 654 additions and 330 deletions.
3 changes: 2 additions & 1 deletion .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
70. [bpt_vehicletax]: chore: bpt_vehicletax update to version 1.0.0 @bitpredator
71. [bpt_wallet]: chore: bpt_wallet update to version 1.0.0 @bitpredator
72. [es_extended]: chore: es_extended add underflow check for removeAccountMoney @bitpredator
73. [esx_context]: chore: esx_context update to version 1.0.0 @bitpredator
73. [esx_context]: chore: esx_context update to version 1.0.0 @bitpredator
74. [esx_menu_default]: chore: esx_menu_default update to version 1.0.0 @bitpredator
4 changes: 2 additions & 2 deletions server-data/resources/[esx]/esx_menu_default/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

esx_menu_default
Copyright (C) 2015-2023 Jérémie N'gadi
Copyright (C) 2015-2024 Jérémie N'gadi

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi
esx_menu_default Copyright (C) 2015-2024 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
2 changes: 1 addition & 1 deletion server-data/resources/[esx]/esx_menu_default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

esx_menu_defualt - Default Menu!

Copyright (C) 2015-2023
Copyright (C) 2015-2024

This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.

Expand Down
6 changes: 4 additions & 2 deletions server-data/resources/[esx]/esx_menu_default/client/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ end

local function closeMenu(namespace, name)
CurrentNameSpace = namespace
if OpenedMenus < 1 then return end
OpenedMenus = OpenedMenus - 1
if OpenedMenus < 0 then
OpenedMenus = 0
end
SendNUIMessage({
action = 'closeMenu',
namespace = namespace,
Expand All @@ -24,7 +26,7 @@ local function closeMenu(namespace, name)
end

AddEventHandler('onResourceStop', function(resource)
if GetCurrentResourceName() == resource and OpenedMenus > 0 then
if GetCurrentResourceName() == resource and OpenedMenus > 0 then
ESX.UI.Menu.CloseAll()
elseif CurrentNameSpace ~= nil and CurrentNameSpace == resource and OpenedMenus > 0 then
ESX.UI.Menu.CloseAll()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ game 'gta5'

description 'Menu Default'
lua54 'yes'
version '0.0.4'
version '1.0.0'

client_scripts {'@es_extended/imports.lua', 'client/main.lua'}

Expand Down
6 changes: 3 additions & 3 deletions server-data/resources/[esx]/esx_menu_default/html/css/app.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500;600&display=swap');
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@500;600&display=swap");

::-webkit-scrollbar {
display: none;
}

.menu {
font-family: 'Poppins', sans-serif;
font-family: "Poppins", sans-serif;
min-width: 350px;
color: #fff;
position: absolute;
Expand Down Expand Up @@ -107,4 +107,4 @@
left: 50%;
top: 35%;
transform: translate(-50%, 50%);
}
}
Loading

0 comments on commit 07470d4

Please sign in to comment.