starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1410 from zImSkillz/main

Browse Source 
Add an option to use the cancel function instead of the close function when closing a menu or all menus.
This commit is contained in:
Gellipapa
2024-10-13 17:08:59 +02:00
committed by GitHub
parent e7eb7f5172 c946633ba9
commit e044f64d1b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/functions.lua
+12 -4
View File
@@ -236,21 +236,29 @@ function ESX.UI.Menu.Open(menuType, namespace, name, data, submit, cancel, chang
return menu return menu
end end
function ESX.UI.Menu.Close(menuType, namespace, name) function ESX.UI.Menu.Close(menuType, namespace, name, cancel)
for i = 1, #ESX.UI.Menu.Opened, 1 do for i = 1, #ESX.UI.Menu.Opened, 1 do
if ESX.UI.Menu.Opened[i] then if ESX.UI.Menu.Opened[i] then
if ESX.UI.Menu.Opened[i].type == menuType and ESX.UI.Menu.Opened[i].namespace == namespace and ESX.UI.Menu.Opened[i].name == name then if ESX.UI.Menu.Opened[i].type == menuType and ESX.UI.Menu.Opened[i].namespace == namespace and ESX.UI.Menu.Opened[i].name == name then
ESX.UI.Menu.Opened[i].close() if not cancel then
ESX.UI.Menu.Opened[i].close()
else
ESX.UI.Menu.Opened[i].cancel()
end
ESX.UI.Menu.Opened[i] = nil ESX.UI.Menu.Opened[i] = nil
end end
end end
end end
end end
function ESX.UI.Menu.CloseAll() function ESX.UI.Menu.CloseAll(cancel)
for i = 1, #ESX.UI.Menu.Opened, 1 do for i = 1, #ESX.UI.Menu.Opened, 1 do
if ESX.UI.Menu.Opened[i] then if ESX.UI.Menu.Opened[i] then
ESX.UI.Menu.Opened[i].close() if not cancel then
ESX.UI.Menu.Opened[i].close()
else
ESX.UI.Menu.Opened[i].cancel()
end
ESX.UI.Menu.Opened[i] = nil ESX.UI.Menu.Opened[i] = nil
end end
end end