From c59417eba71ffc39908e53ec766e1bdbfbd772d1 Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 28 Mar 2020 17:52:01 +0000 Subject: [PATCH] Removed keyboard set code --- cl_radar.lua | 32 +------------------------------- nui/radar.css | 10 +++------- nui/radar.html | 1 - nui/radar.js | 23 ----------------------- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/cl_radar.lua b/cl_radar.lua index 5cdfdae..d23b505 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -244,11 +244,7 @@ RADAR.vars = threadWaitTime = 500, -- Key lock, when true, prevents any of the radar's key events from working, like the ELS key lock - keyLock = false, - - -- Full keyboard, when true, the keybinds for the radar will be set to the keys on the numpad, when false, the - -- keybinds for the radar will be set to the number keys above WASD - fullKeyboard = true + keyLock = false } -- Speed conversion values @@ -496,32 +492,6 @@ function RADAR:GetKeyLockState() return self.vars.keyLock end --- Toggles between the full and small keybinds -function RADAR:ToggleFullKeyboard() - -- Check the player state is valid - if ( PLY:VehicleStateValid() ) then - -- Toggle the full keyboard state - self.vars.fullKeyboard = not self.vars.fullKeyboard - - -- Tell the NUI side to display the keybind message - SendNUIMessage( { _type = "displayKeybindChange", state = self:GetFullKeyboardState() } ) - end -end - --- Returns the full keyboard state -function RADAR:GetFullKeyboardState() - return self.vars.fullKeyboard -end - --- Returns which keybind set to use -function RADAR:GetKeybindType() - if ( self:GetFullKeyboardState() ) then - return "full" - else - return "small" - end -end - --[[---------------------------------------------------------------------------------- Radar menu functions diff --git a/nui/radar.css b/nui/radar.css index 602a601..4079723 100644 --- a/nui/radar.css +++ b/nui/radar.css @@ -997,11 +997,11 @@ button:focus { outline: none; } padding: 0; } -#keyLockLabel, #keyBindsLabel { +#keyLockLabel { position: absolute; left: 0; right: 0; - bottom: 350px; + bottom: 300px; text-align: center; font-size: 30px; @@ -1011,11 +1011,7 @@ button:focus { outline: none; } z-index: 5; } - #keyBindsLabel { - bottom: 300px; - } - - #keyLockLabel span, #keyBindsLabel span { + #keyLockLabel span { font-size: 30px; } diff --git a/nui/radar.html b/nui/radar.html index 6301d62..7277949 100644 --- a/nui/radar.html +++ b/nui/radar.html @@ -299,7 +299,6 @@

Radar key lock

-

Radar keybinds set for a

diff --git a/nui/radar.js b/nui/radar.js index 7f18a33..3a31ea0 100644 --- a/nui/radar.js +++ b/nui/radar.js @@ -150,11 +150,6 @@ const elements = stateLabel: $( "#keyLockStateLabel" ) }, - keyBinds: { - label: $( "#keyBindsLabel" ), - stateLabel: $( "#keyBindsStateLabel" ) - }, - patrolSpeed: $( "#patrolSpeed" ), antennas: { @@ -233,7 +228,6 @@ elements.plateReader.hide(); elements.plateReaderBox.hide(); elements.uiSettingsBox.hide(); elements.keyLock.label.hide(); -elements.keyBinds.label.hide(); elements.helpWindow.hide(); elements.qsvWindow.hide(); elements.newUser.hide(); @@ -626,20 +620,6 @@ function displayKeyLock( state ) }, 2000 ); } -function displayKeybindState( state ) -{ -// Set the state label text to enabled or disabled - elements.keyBinds.stateLabel.html( state ? "full keyboard" : "small keyboard" ); - - // Fade in the label - elements.keyBinds.label.fadeIn(); - - // Make the label fade out after 2 seconds - setTimeout( function() { - elements.keyBinds.label.fadeOut(); - }, 2000 ); -} - // This function is used to send data back through to the LUA side function sendData( name, data ) { $.post( "http://" + resourceName + "/" + name, JSON.stringify( data ), function( datab ) { @@ -1102,9 +1082,6 @@ window.addEventListener( "message", function( event ) { case "displayKeyLock": displayKeyLock( item.state ); break; - case "displayKeybindChange": - displayKeybindState( item.state ); - return; case "showNewUser": setEleVisible( elements.newUser, true ); break;