From 5a1a2e98a15b2063ff8ddbb41ea6e3780ea8f9e2 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Sun, 11 Sep 2022 11:45:15 +0200 Subject: [PATCH 1/3] remove unused links --- [esx_addons]/esx_banking/html/ui.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/[esx_addons]/esx_banking/html/ui.html b/[esx_addons]/esx_banking/html/ui.html index aa5b68f9..922ff813 100644 --- a/[esx_addons]/esx_banking/html/ui.html +++ b/[esx_addons]/esx_banking/html/ui.html @@ -3,7 +3,6 @@ - @@ -15,7 +14,6 @@ - - \ No newline at end of file + From 1e9eadbd954c81b264833d981f134cc5889eba9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horv=C3=A1th=20Gell=C3=A9rt?= Date: Sun, 11 Sep 2022 12:10:00 +0200 Subject: [PATCH 2/3] remove unused variable in app js and remove images folder --- .../esx_banking/html/images/checkmark.svg | 56 ------------------- [esx_addons]/esx_banking/html/scripts/app.js | 31 ---------- 2 files changed, 87 deletions(-) delete mode 100644 [esx_addons]/esx_banking/html/images/checkmark.svg diff --git a/[esx_addons]/esx_banking/html/images/checkmark.svg b/[esx_addons]/esx_banking/html/images/checkmark.svg deleted file mode 100644 index 583c32e8..00000000 --- a/[esx_addons]/esx_banking/html/images/checkmark.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/[esx_addons]/esx_banking/html/scripts/app.js b/[esx_addons]/esx_banking/html/scripts/app.js index ff2d5c01..1a8f5df4 100644 --- a/[esx_addons]/esx_banking/html/scripts/app.js +++ b/[esx_addons]/esx_banking/html/scripts/app.js @@ -264,25 +264,7 @@ class Render { language = "" constructor(elementID){ this.elementID = elementID - // this.fullRenderData = renderData } - - // getCurrentTemplate(){ - // let functionName = "" - // switch(this.elementID){ - // case "bankcard": - // functionName = this.renderBankCard() - // break; - // case "your_money": - // functionName = this.renderMyMoneySection() - // break; - // case "transaction": - // functionName = this.renderTransactions() - // break; - // } - // return functionName; - // } - renderBankCard(){ const bankData = this.fullRenderData $("#bankcard").empty(); @@ -898,7 +880,6 @@ $(document).ready(function(){ second: false } - let currentNotify = false $(document).on('keyup','input[type="number"] , input[type="password"]',function(){ let buttonGroup = $(this).closest('.input-groups-container').find('button'); @@ -927,12 +908,6 @@ $(document).ready(function(){ if($(this).val() != '') { if($(this).attr("name") == "pincode" && $(this).val().length < 4){ - if(!currentNotify){ - currentNotify = true - setTimeout(function(){ - currentNotify = false - },3000) - } return } @@ -962,12 +937,6 @@ $(document).ready(function(){ let inputValue = $(this).prev('input').val(); if(inputValue == undefined){return} if((inputValue.length == 0 && inputValue <= 0 )){ - if(!currentNotify){ - currentNotify = true - setTimeout(function(){ - currentNotify = false - },3000) - } return } From 472e18e010a2d65f6b3e6db4d6a8213483fdc810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horv=C3=A1th=20Gell=C3=A9rt?= Date: Sun, 11 Sep 2022 12:38:11 +0200 Subject: [PATCH 3/3] fix blip issue and fix spam escape when try open bank ui --- [esx_addons]/esx_banking/client/main.lua | 2 +- [esx_addons]/esx_banking/html/scripts/app.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index bc10890a..9d84e734 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -20,7 +20,7 @@ end local function CreateBlips() local tmpActiveBlips = {} for i = 1, #Config.Banks do - if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Activate then + if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Enabled then local blip = AddBlipForCoord(Config.Banks[i].Position.xy) SetBlipSprite(blip, Config.Banks[i].Blip.Sprite) SetBlipScale(blip, Config.Banks[i].Blip.Scale) diff --git a/[esx_addons]/esx_banking/html/scripts/app.js b/[esx_addons]/esx_banking/html/scripts/app.js index 1a8f5df4..a2bc9585 100644 --- a/[esx_addons]/esx_banking/html/scripts/app.js +++ b/[esx_addons]/esx_banking/html/scripts/app.js @@ -1,3 +1,4 @@ +var LOADED = true class Components{ static allComponents = [] static generateAllComponents(generatedData,generateType = "bank"){ @@ -55,11 +56,12 @@ class Components{ `); $(appendedDiv).fadeIn(200) - + LOADED = true setTimeout(() => { $(`${appendedDiv}`).fadeOut(200) $("#wrapper").fadeIn().css("display","flex"); if(appendedDiv == ".loader") $("#container").fadeIn().css("display","flex") + LOADED = false }, 2500); }else if(state == "hide"){ $(`${appendedDiv}`).fadeOut(200) @@ -966,8 +968,10 @@ $(document).ready(function(){ $(document).keyup(function(e) { if(e.which == 27) { - Components.loader(".loader","hide") - $.post('https://esx_banking/close', JSON.stringify({})); + if (!LOADED) { + Components.loader(".loader","hide") + $.post('https://esx_banking/close', JSON.stringify({})); + } } }); })