diff --git a/cl_radar.lua b/cl_radar.lua index fcb7f9f..d0c95d6 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -207,7 +207,7 @@ RADAR.sorting = { --[[---------------------------------------------------------------------------------- Radar essentials functions ----------------------------------------------------------------------------------]]-- --- Returns if the radar's power is on or ff +-- Returns if the radar's power is on or off function RADAR:IsPowerOn() return self.vars.power end @@ -402,7 +402,7 @@ function RADAR:ToggleKeyLock() self.vars.keyLock = not self.vars.keyLock -- Tell the NUI side to display the key lock message - SendNUIMessage( { _type = "displayKeyLock" } ) + SendNUIMessage( { _type = "displayKeyLock", state = self:GetKeyLockState() } ) end end diff --git a/nui/radar.css b/nui/radar.css index 4664bd7..28eeea3 100644 --- a/nui/radar.css +++ b/nui/radar.css @@ -736,4 +736,7 @@ button:focus { outline: none; } text-shadow: 3px 2px 5px rgb( 0, 0, 0 ); z-index: 4; -} \ No newline at end of file +} + #keyLockLabel span { + font-size: 30px; + } \ No newline at end of file diff --git a/nui/radar.html b/nui/radar.html index b192090..6b05bf1 100644 --- a/nui/radar.html +++ b/nui/radar.html @@ -200,7 +200,7 @@ -
Radar key lock toggled
+Radar key lock
diff --git a/nui/radar.js b/nui/radar.js index ca35866..3913e66 100644 --- a/nui/radar.js +++ b/nui/radar.js @@ -69,7 +69,10 @@ const elements = safezoneSlider: $( "#safezone" ), safezoneDisplay: $( "#safezoneDisplay" ), - keyLock: $( "#keyLockLabel" ), + keyLock: { + label: $( "#keyLockLabel" ), + stateLabel: $( "#keyLockStateLabel" ) + }, patrolSpeed: $( "#patrolSpeed" ), @@ -144,7 +147,7 @@ const dirs = elements.radar.hide(); elements.remote.hide(); elements.uiSettingsBox.hide(); -elements.keyLock.hide(); +elements.keyLock.label.hide(); elements.uiSettingsBtn.click( function() { setUISettingsVisible( true, true ); @@ -373,12 +376,14 @@ function settingUpdate( ants ) } } -function displayKeyLock() +function displayKeyLock( state ) { - elements.keyLock.fadeIn(); + elements.keyLock.stateLabel.html( state ? "enabled" : "disabled" ); + + elements.keyLock.label.fadeIn(); setTimeout( function() { - elements.keyLock.fadeOut(); + elements.keyLock.label.fadeOut(); }, 2000 ); } @@ -670,7 +675,7 @@ window.addEventListener( "message", function( event ) { playLockAudio( item.ant, item.dir, item.vol ); break; case "displayKeyLock": - displayKeyLock(); + displayKeyLock( item.state ); break; default: break;