Merge pull request #978 from MoskalykA/moskalyka/===

refactor: slight optimization
This commit is contained in:
Csoki
2023-04-19 15:52:14 +02:00
committed by GitHub
7 changed files with 31 additions and 31 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
chunk: chunk,
};
if (i == str.length - 1) data.end = true;
if (i === str.length - 1) data.end = true;
$.post("http://" + namespace + "/__chunk", JSON.stringify(data));
}
+2 -2
View File
@@ -20,7 +20,7 @@ function _U() {
}
// Has the locale file been set?
if (locale.length == 0) {
if (locale.length === 0) {
console.log('locale.js: no locale has been set');
return 'locale.js: no locale has been set';
}
@@ -32,7 +32,7 @@ function _U() {
}
// Do we need to format the string?
if (args.length == 1) {
if (args.length === 1) {
return capitalize(locale[string]);
} else {
return formatString(args);
+4 -4
View File
@@ -269,7 +269,7 @@
}
if (ele.input) {
if (ele.inputType == "radio") {
if (ele.inputType === "radio") {
for (let j = 0; j < ele.inputValues.length; j++) {
let v = ele.inputValues[j];
let container = CreateElement("label", "container", div);
@@ -279,7 +279,7 @@
input.type = "radio";
input.name = i + 1;
input.checked =
(ele.inputValue || ele.inputPlaceholder || -1) == v.value;
(ele.inputValue || ele.inputPlaceholder || -1) === v.value;
let span = CreateElement("SPAN", "checkmark", container);
@@ -390,8 +390,8 @@
});
window.addEventListener("keydown", (e) => {
if (e.key == "Escape" || e.key == "Backspace") {
if (e.target.tagName.toLowerCase() == "input") {
if (e.key === "Escape" || e.key === "Backspace") {
if (e.target.tagName.toLowerCase() === "input") {
return;
}
+1 -1
View File
@@ -110,7 +110,7 @@
function TriggeredKey(e) {
var keycode;
if (window.event) keycode = window.event.keyCode;
if (window.event.keyCode == 13 || window.event.keyCode == 27)
if (window.event.keyCode === 13 || window.event.keyCode === 27)
return false;
}
</script>
+10 -10
View File
@@ -18,7 +18,7 @@
ESX_MENU.pos = {};
ESX_MENU.open = function (namespace, name, data) {
if (typeof ESX_MENU.opened[namespace] == "undefined") {
if (typeof ESX_MENU.opened[namespace] === "undefined") {
ESX_MENU.opened[namespace] = {};
}
@@ -26,12 +26,12 @@
ESX_MENU.close(namespace, name);
}
if (typeof ESX_MENU.pos[namespace] == "undefined") {
if (typeof ESX_MENU.pos[namespace] === "undefined") {
ESX_MENU.pos[namespace] = {};
}
for (let i = 0; i < data.elements.length; i++) {
if (typeof data.elements[i].type == "undefined") {
if (typeof data.elements[i].type === "undefined") {
data.elements[i].type = "default";
}
}
@@ -72,8 +72,8 @@
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace == namespace &&
ESX_MENU.focus[i].name == name
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
ESX_MENU.focus.splice(i, 1);
break;
@@ -104,7 +104,7 @@
case "slider": {
element.isSlider = true;
element.sliderLabel =
typeof element.options == "undefined"
typeof element.options === "undefined"
? element.value
: element.options[element.value];
@@ -115,7 +115,7 @@
break;
}
if (i == ESX_MENU.pos[namespace][name]) {
if (i === ESX_MENU.pos[namespace][name]) {
element.selected = true;
}
}
@@ -229,7 +229,7 @@
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]) {
if (i === ESX_MENU.pos[focused.namespace][focused.name]) {
menu.elements[i].selected = true;
} else {
menu.elements[i].selected = false;
@@ -265,7 +265,7 @@
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]) {
if (i === ESX_MENU.pos[focused.namespace][focused.name]) {
menu.elements[i].selected = true;
} else {
menu.elements[i].selected = false;
@@ -296,7 +296,7 @@
break;
case "slider": {
let min = typeof elem.min == "undefined" ? 0 : elem.min;
let min = typeof elem.min === "undefined" ? 0 : elem.min;
if (elem.value > min) {
elem.value--;
+8 -8
View File
@@ -15,7 +15,7 @@
ESX_MENU.pos = {};
ESX_MENU.open = function (namespace, name, data) {
if (typeof ESX_MENU.opened[namespace] == "undefined") {
if (typeof ESX_MENU.opened[namespace] === "undefined") {
ESX_MENU.opened[namespace] = {};
}
@@ -23,15 +23,15 @@
ESX_MENU.close(namespace, name);
}
if (typeof ESX_MENU.pos[namespace] == "undefined") {
if (typeof ESX_MENU.pos[namespace] === "undefined") {
ESX_MENU.pos[namespace] = {};
}
if (typeof data.type == "undefined") {
if (typeof data.type === "undefined") {
data.type = "default";
}
if (typeof data.align == "undefined") {
if (typeof data.align === "undefined") {
data.align = "top-left";
}
@@ -48,10 +48,10 @@
});
document.onkeyup = function (key) {
if (key.which == 27) {
if (key.which === 27) {
// Escape key
SendMessage(ESX_MENU.ResourceName, "menu_cancel", data);
} else if (key.which == 13) {
} else if (key.which === 13) {
// Enter key
SendMessage(ESX_MENU.ResourceName, "menu_submit", data);
}
@@ -65,8 +65,8 @@
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace == namespace &&
ESX_MENU.focus[i].name == name
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
ESX_MENU.focus.splice(i, 1);
break;
+5 -5
View File
@@ -23,7 +23,7 @@
ESX_MENU.data = {};
ESX_MENU.open = function (namespace, name, data) {
if (typeof ESX_MENU.opened[namespace] == "undefined") {
if (typeof ESX_MENU.opened[namespace] === "undefined") {
ESX_MENU.opened[namespace] = {};
}
@@ -49,8 +49,8 @@
for (let i = 0; i < ESX_MENU.focus.length; i++) {
if (
ESX_MENU.focus[i].namespace == namespace &&
ESX_MENU.focus[i].name == name
ESX_MENU.focus[i].namespace === namespace &&
ESX_MENU.focus[i].name === name
) {
ESX_MENU.focus.splice(i, 1);
break;
@@ -68,7 +68,7 @@
$(menuContainer).hide();
for (let namespace in ESX_MENU.opened) {
if (typeof ESX_MENU.data[namespace] == "undefined") {
if (typeof ESX_MENU.data[namespace] === "undefined") {
ESX_MENU.data[namespace] = {};
}
@@ -201,7 +201,7 @@
};
document.onkeyup = function (data) {
if (data.which == 27) {
if (data.which === 27) {
let focused = ESX_MENU.getFocused();
ESX_MENU.cancel(focused.namespace, focused.name);
}