starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-28 23:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting(all): Format with prettier and lua formatter

Browse Source
This commit is contained in:
TheFantomas
2023-07-09 17:00:36 +02:00
parent 860ecbfbc4
commit 9049c98d76
49 changed files with 3915 additions and 2635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+10
View File
@@ -0,0 +1,10 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
max_line_length = 300
indent_size = 4
indent_style = space
[core]/cron/server/main.lua
+5 -1
View File
@@ -15,7 +15,11 @@ function GetTime()
local h = tonumber(os.date('%H', timestamp))
local m = tonumber(os.date('%M', timestamp))
return { d = d, h = h, m = m }
return {
d = d,
h = h,
m = m
}
end
function OnTime(d, h, m)
[core]/es_extended/client/functions.lua
-6
View File
@@ -203,7 +203,6 @@ function ESX.UI.Menu.Open(type, namespace, name, data, submit, cancel, change, c
menu.change = change
menu.close = function()
ESX.UI.Menu.RegisteredTypes[type].close(namespace, name)
for i = 1, #ESX.UI.Menu.Opened, 1 do
@@ -218,11 +217,9 @@ function ESX.UI.Menu.Open(type, namespace, name, data, submit, cancel, change, c
if close then
close()
end
end
menu.update = function(query, newData)
for i = 1, #menu.data.elements, 1 do
local match = true
@@ -238,7 +235,6 @@ function ESX.UI.Menu.Open(type, namespace, name, data, submit, cancel, change, c
end
end
end
end
menu.refresh = function()
@@ -266,7 +262,6 @@ function ESX.UI.Menu.Open(type, namespace, name, data, submit, cancel, change, c
break
end
end
end
end
end
@@ -496,7 +491,6 @@ function ESX.Game.GetPlayers(onlyOtherPlayers, returnKeyValue, returnPeds)
return players
end
function ESX.Game.GetClosestObject(coords, modelFilter)
return ESX.Game.GetClosestEntity(ESX.Game.GetObjects(), false, coords, modelFilter)
end
[core]/es_extended/html/css/app.css
+1 -2
View File
@@ -20,8 +20,7 @@ html {
font-size: 2em;
font-weight: bold;
color: #fff;
text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000,
1px 1px 0 #000;
text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
}
.menu {
[core]/es_extended/html/js/mustache.min.js
Vendored
+347 -1
View File
File diff suppressed because one or more lines are too long
[core]/es_extended/html/js/wrapper.js
+1 -2
View File
@@ -4,8 +4,7 @@
ESXWrapper.messageId = 0;
window.SendMessage = function (namespace, type, msg) {
ESXWrapper.messageId =
ESXWrapper.messageId < 65535 ? ESXWrapper.messageId + 1 : 0;
ESXWrapper.messageId = ESXWrapper.messageId < 65535 ? ESXWrapper.messageId + 1 : 0;
const str = JSON.stringify(msg);
for (let i = 0; i < str.length; i++) {
[core]/es_extended/server/main.lua
+20 -7
View File
@@ -56,7 +56,6 @@ function onPlayerJoined(playerId)
if result then
loadESXPlayer(identifier, playerId, false)
else
createESXPlayer(identifier, playerId)
end
end
@@ -363,7 +362,6 @@ function loadESXPlayer(identifier, playerId, isNew)
print(('[^2INFO^0] Player ^5"%s"^0 has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId))
end
AddEventHandler('chatMessage', function(playerId, _, message)
local xPlayer = ESX.GetPlayerFromId(playerId)
if message:sub(1, 1) == '/' and playerId > 0 then
@@ -621,8 +619,16 @@ end
ESX.RegisterServerCallback('esx:getPlayerData', function(source, cb)
local xPlayer = ESX.GetPlayerFromId(source)
cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), metadata = xPlayer.getMeta()})
cb({
identifier = xPlayer.identifier,
accounts = xPlayer.getAccounts(),
inventory = xPlayer.getInventory(),
job = xPlayer.getJob(),
loadout = xPlayer.getLoadout(),
money = xPlayer.getMoney(),
position = xPlayer.getCoords(true),
metadata = xPlayer.getMeta()
})
end)
ESX.RegisterServerCallback('esx:isUserAdmin', function(source, cb)
@@ -636,8 +642,16 @@ end)
ESX.RegisterServerCallback('esx:getOtherPlayerData', function(_, cb, target)
local xPlayer = ESX.GetPlayerFromId(target)
cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), metadata = xPlayer.getMeta()})
cb({
identifier = xPlayer.identifier,
accounts = xPlayer.getAccounts(),
inventory = xPlayer.getInventory(),
job = xPlayer.getJob(),
loadout = xPlayer.getLoadout(),
money = xPlayer.getMoney(),
position = xPlayer.getCoords(true),
metadata = xPlayer.getMeta()
})
end)
ESX.RegisterServerCallback('esx:getPlayerNames', function(source, cb, players)
@@ -684,4 +698,3 @@ end)
AddEventHandler('txAdmin:events:serverShuttingDown', function()
Core.SavePlayers()
end)
[core]/esx_context/index.html
+4 -14
View File
@@ -2,14 +2,8 @@
<html>
<head>
<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css"
/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" />
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -227,10 +221,7 @@
<i class="fas fa-check"></i>
<div>
<b>Item</b>
<i
>Testing, testing a description here. Generic words to force
overflow.</i
>
<i>Testing, testing a description here. Generic words to force overflow.</i>
</div>
</div>
</div>
@@ -278,8 +269,7 @@
let input = CreateElement("INPUT", "", container);
input.type = "radio";
input.name = i + 1;
input.checked =
(ele.inputValue || ele.inputPlaceholder || -1) === v.value;
input.checked = (ele.inputValue || ele.inputPlaceholder || -1) === v.value;
let span = CreateElement("SPAN", "checkmark", container);
[core]/esx_identity/html/index.html
+6 -34
View File
@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous" />
<link href="css/style.css" rel="stylesheet" />
@@ -12,37 +11,13 @@
<div class="dialog">
<div class="title"><b>IDENTITY</b></div>
<form id="register" name="register" action="#">
<div style="
color: rgb(46, 187, 205);
font-size: 12px;
font-family: 'Gill Sans', sans-serif;
">
First Name
</div>
<div style="color: rgb(46, 187, 205); font-size: 12px; font-family: 'Gill Sans', sans-serif">First Name</div>
<input id="firstname" type="text" class="" name="firstname" placeholder="First Name" minlength="3" maxlength="8" pattern="[a-zA-Z]*" /><br />
<div style="
color: rgb(46, 187, 205);
font-size: 12px;
font-family: 'Gill Sans', sans-serif;
">
Last Name
</div>
<div style="color: rgb(46, 187, 205); font-size: 12px; font-family: 'Gill Sans', sans-serif">Last Name</div>
<input id="lastname" type="text" class="" name="lastname" placeholder="Last Name" minlength="3" maxlength="10" pattern="[a-zA-Z]*" /><br />
<div style="
color: rgb(46, 187, 205);
font-size: 12px;
font-family: 'Gill Sans', sans-serif;
">
Date of Birth (MM/DD/YYYY)
</div>
<div style="color: rgb(46, 187, 205); font-size: 12px; font-family: 'Gill Sans', sans-serif">Date of Birth (MM/DD/YYYY)</div>
<input id="dateofbirth" type="date" name="dateofbirth" class="" min="1900-01-01" max="2010-01-01" onfocus="(this.type='date')" /><br />
<div style="
color: rgb(46, 187, 205);
font-size: 12px;
font-family: 'Gill Sans', sans-serif;
">
Height
</div>
<div style="color: rgb(46, 187, 205); font-size: 12px; font-family: 'Gill Sans', sans-serif">Height</div>
<input id="height" type="number" class="" name="height" min="120" max="220" placeholder="Height (cm)" /><br />
<center>
<div class="radio-toolbar">
@@ -58,8 +33,7 @@
</button>
</form>
<center>
<font size="1px" color="green">If the submit button doesn't work, please ensure that you've entered
the fields correctly.</font>
<font size="1px" color="green">If the submit button doesn't work, please ensure that you've entered the fields correctly.</font>
</center>
</div>
@@ -67,11 +41,9 @@
function TriggeredKey(e) {
var keycode;
if (window.event) keycode = window.event.keyCode;
if (window.event.keyCode === 13 || window.event.keyCode === 27)
return false;
if (window.event.keyCode === 13 || window.event.keyCode === 27) return false;
}
</script>
<script src="js/script.js" defer></script>
</body>
</html>
[core]/esx_identity/html/js/script.js
+4 -11
View File
@@ -12,15 +12,9 @@ document.querySelector("#register").addEventListener("submit", (event) => {
const dateCheck = new Date(dofVal);
const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format(
dateCheck
);
const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format(
dateCheck
);
const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format(
dateCheck
);
const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format(dateCheck);
const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format(dateCheck);
const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format(dateCheck);
const formattedDate = `${day}/${month}/${year}`;
fetch("http://esx_identity/register", {
@@ -29,8 +23,7 @@ document.querySelector("#register").addEventListener("submit", (event) => {
firstname: document.querySelector("#firstname").value,
lastname: document.querySelector("#lastname").value,
dateofbirth: formattedDate,
sex: document.querySelector("input[type='radio'][name='sex']:checked")
.value,
sex: document.querySelector("input[type='radio'][name='sex']:checked").value,
height: document.querySelector("#height").value,
}),
});
[core]/esx_loadingscreen/index.html
+1 -4
View File
@@ -1,10 +1,7 @@
<html lang="en">
<head>
<link rel="stylesheet" href="css/index.css" type="text/css" />
<link
href="https://fonts.googleapis.com/css2?family=Quicksand&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css2?family=Quicksand&display=swap" rel="stylesheet" />
<script src="./js/index.js" type="text/javascript"></script>
</head>
[core]/esx_menu_default/html/js/app.js
+6 -18
View File
@@ -71,10 +71,7 @@
delete ESX_MENU.opened[namespace][name];
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
if (ESX_MENU.focus[i].namespace === namespace && ESX_MENU.focus[i].name === name) {
ESX_MENU.focus.splice(i, 1);
break;
}
@@ -103,10 +100,7 @@
case "slider": {
element.isSlider = true;
element.sliderLabel =
typeof element.options === "undefined"
? element.value
: element.options[element.value];
element.sliderLabel = typeof element.options === "undefined" ? element.value : element.options[element.value];
break;
}
@@ -221,12 +215,10 @@
if (pos > 0) {
ESX_MENU.pos[focused.namespace][focused.name]--;
} else {
ESX_MENU.pos[focused.namespace][focused.name] =
menu.elements.length - 1;
ESX_MENU.pos[focused.namespace][focused.name] = menu.elements.length - 1;
}
let elem =
menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
let elem = menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
for (let i = 0; i < menu.elements.length; i++) {
if (i === ESX_MENU.pos[focused.namespace][focused.name]) {
@@ -261,8 +253,7 @@
ESX_MENU.pos[focused.namespace][focused.name] = 0;
}
let elem =
menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
let elem = menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
for (let i = 0; i < menu.elements.length; i++) {
if (i === ESX_MENU.pos[focused.namespace][focused.name]) {
@@ -332,10 +323,7 @@
break;
case "slider": {
if (
typeof elem.options != "undefined" &&
elem.value < elem.options.length - 1
) {
if (typeof elem.options != "undefined" && elem.value < elem.options.length - 1) {
elem.value++;
ESX_MENU.change(focused.namespace, focused.name, elem);
}
[core]/esx_menu_default/html/js/mustache.min.js
Vendored
+347 -1
View File
File diff suppressed because one or more lines are too long
[core]/esx_menu_default/html/ui.html
+3 -12
View File
@@ -3,23 +3,14 @@
<meta charset="utf-8" />
<link rel="stylesheet" href="nui://esx_menu_default/html/css/app.css" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=PT+Sans+Narrow&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css2?family=PT+Sans+Narrow&display=swap" rel="stylesheet" />
</head>
<body>
<div id="menus"></div>
<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
<script
src="nui://esx_menu_default/html/js/mustache.min.js"
type="text/javascript"
></script>
<script
src="nui://esx_menu_default/html/js/app.js"
type="text/javascript"
></script>
<script src="nui://esx_menu_default/html/js/mustache.min.js" type="text/javascript"></script>
<script src="nui://esx_menu_default/html/js/app.js" type="text/javascript"></script>
</body>
</html>
[core]/esx_menu_dialog/html/js/app.js
+1 -4
View File
@@ -64,10 +64,7 @@
delete ESX_MENU.opened[namespace][name];
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
if (ESX_MENU.focus[i].namespace === namespace && ESX_MENU.focus[i].name === name) {
ESX_MENU.focus.splice(i, 1);
break;
}
[core]/esx_menu_dialog/html/js/mustache.min.js
Vendored
+347 -1
View File
File diff suppressed because one or more lines are too long
[core]/esx_menu_dialog/html/ui.html
+3 -12
View File
@@ -3,10 +3,7 @@
<meta charset="utf-8" />
<link rel="stylesheet" href="nui://esx_menu_dialog/html/css/app.css" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@1,300&family=PT+Sans+Narrow&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@1,300&family=PT+Sans+Narrow&display=swap" rel="stylesheet" />
</head>
<body>
@@ -14,13 +11,7 @@
<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
<script src="nui://es_extended/html/js/wrapper.js"></script>
<script
src="nui://esx_menu_dialog/html/js/mustache.min.js"
type="text/javascript"
></script>
<script
src="nui://esx_menu_dialog/html/js/app.js"
type="text/javascript"
></script>
<script src="nui://esx_menu_dialog/html/js/mustache.min.js" type="text/javascript"></script>
<script src="nui://esx_menu_dialog/html/js/app.js" type="text/javascript"></script>
</body>
</html>
[core]/esx_menu_list/html/js/app.js
+4 -24
View File
@@ -48,10 +48,7 @@
delete ESX_MENU.opened[namespace][name];
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
if (ESX_MENU.focus[i].namespace === namespace && ESX_MENU.focus[i].name === name) {
ESX_MENU.focus.splice(i, 1);
break;
}
@@ -107,20 +104,7 @@
}
for (let k = 0; k < matches.length; k++) {
col = col.replace(
"{{" + matches[k][1] + "|" + matches[k][2] + "}}",
'<button data-id="' +
i +
'" data-namespace="' +
namespace +
'" data-name="' +
name +
'" data-value="' +
matches[k][2] +
'">' +
matches[k][1] +
"</button>"
);
col = col.replace("{{" + matches[k][1] + "|" + matches[k][2] + "}}", '<button data-id="' + i + '" data-namespace="' + namespace + '" data-name="' + name + '" data-value="' + matches[k][2] + '">' + matches[k][1] + "</button>");
}
view.rows[i].cols.push({ data: data, content: col });
@@ -130,13 +114,9 @@
let menu = $(Mustache.render(MenuTpl, view));
menu.find("button[data-namespace][data-name]").click(function () {
ESX_MENU.data[$(this).data("namespace")][$(this).data("name")][
parseInt($(this).data("id"))
].currentRow = parseInt($(this).data("id")) + 1;
ESX_MENU.data[$(this).data("namespace")][$(this).data("name")][parseInt($(this).data("id"))].currentRow = parseInt($(this).data("id")) + 1;
ESX_MENU.submit($(this).data("namespace"), $(this).data("name"), {
data: ESX_MENU.data[$(this).data("namespace")][
$(this).data("name")
][parseInt($(this).data("id"))],
data: ESX_MENU.data[$(this).data("namespace")][$(this).data("name")][parseInt($(this).data("id"))],
value: $(this).data("value"),
});
});
[core]/esx_menu_list/html/js/mustache.min.js
Vendored
+347 -1
View File
File diff suppressed because one or more lines are too long
[core]/esx_multicharacter/html/js/app.js
+1 -3
View File
@@ -48,9 +48,7 @@ var money = Intl.NumberFormat("en-US", {
Kashacter.CloseUI = function () {
$("body").css({ display: "none" });
$(".main-container").css({ display: "none" });
$("[data-charid=1]").html(
'<h3 class="character-fullname"></h3><div class="character-info"><p class="character-info-new"></p></div>'
);
$("[data-charid=1]").html('<h3 class="character-fullname"></h3><div class="character-info"><p class="character-info-new"></p></div>');
};
window.onload = function (e) {
[core]/esx_multicharacter/html/ui.html
+2 -9
View File
@@ -1,10 +1,7 @@
<html>
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<!-- Custom CSS -->
<link rel="stylesheet" type="text/css" href="css/main.css" />
<!-- Locales -->
@@ -19,11 +16,7 @@
</div>
<div class="footer">Multicharacter</div>
</div>
<script
src="https://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"
></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="js/app.js" type="text/javascript"></script>
</body>
</html>
[core]/esx_notify/nui/index.html
+1 -4
View File
@@ -2,10 +2,7 @@
<html lang="en">
<head>
<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
/>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
<link rel="stylesheet" href="css/style.css" />
<script src="js/script.js"></script>
<title>ESX Notify</title>
[core]/esx_notify/nui/js/script.js
+1 -3
View File
@@ -60,9 +60,7 @@ notification = (data) => {
const notification = $(`
<div class="notify ${data.type}">
<div class="innerText">
<span class="material-symbols-outlined icon">${
types[data.type]["icon"]
}</span>
<span class="material-symbols-outlined icon">${types[data.type]["icon"]}</span>
<p class="text">${data["message"]}</p>
</div>
</div>
[core]/esx_progressbar/nui/index.html
+1 -6
View File
@@ -42,12 +42,7 @@
height: 2px;
width: 100%;
border-radius: 20px;
background: linear-gradient(
to right,
#0052d4,
#4364f7,
#6fb1fc
); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
background: linear-gradient(to right, #0052d4, #4364f7, #6fb1fc); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
}
.icon {
[core]/esx_textui/nui/index.html
+1 -4
View File
@@ -1,10 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
/>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
<script src="https://kit.fontawesome.com/a81368914c.js"></script>
<link rel="stylesheet" href="css/style.css" />
<script src="js/script.js"></script>