Add callbacks to all events to prevent requests from stalling

This commit is contained in:
Jamelele
2020-05-24 15:22:39 +00:00
parent 9de5694899
commit e0931ed351
2 changed files with 20 additions and 10 deletions

View File

@@ -174,15 +174,17 @@ AddEventHandler( "wk:togglePlateLock", function( cam, beep, bolo )
end ) end )
-- Runs when the "Toggle Display" button is pressed on the plate reder box -- Runs when the "Toggle Display" button is pressed on the plate reder box
RegisterNUICallback( "togglePlateReaderDisplay", function() RegisterNUICallback( "togglePlateReaderDisplay", function( data, cb )
-- Toggle the display state -- Toggle the display state
READER:ToggleDisplayState() READER:ToggleDisplayState()
cb({})
end ) end )
-- Runs when the "Set BOLO Plate" button is pressed on the plate reader box -- Runs when the "Set BOLO Plate" button is pressed on the plate reader box
RegisterNUICallback( "setBoloPlate", function( plate, cb ) RegisterNUICallback( "setBoloPlate", function( plate, cb )
-- Set the BOLO plate -- Set the BOLO plate
READER:SetBoloPlate( plate ) READER:SetBoloPlate( plate )
cb({})
end ) end )
-- This is the main function that runs and scans all vehicles in front and behind the patrol vehicle -- This is the main function that runs and scans all vehicles in front and behind the patrol vehicle

View File

@@ -1419,25 +1419,28 @@ end
NUI callback NUI callback
----------------------------------------------------------------------------------]]-- ----------------------------------------------------------------------------------]]--
-- Runs when the "Toggle Display" button is pressed on the remote control -- Runs when the "Toggle Display" button is pressed on the remote control
RegisterNUICallback( "toggleRadarDisplay", function() RegisterNUICallback( "toggleRadarDisplay", function( data, cb )
-- Toggle the display state -- Toggle the display state
RADAR:ToggleDisplayState() RADAR:ToggleDisplayState()
cb({})
end ) end )
-- Runs when the user presses the power button on the radar ui -- Runs when the user presses the power button on the radar ui
RegisterNUICallback( "togglePower", function() RegisterNUICallback( "togglePower", function( data, cb )
-- Toggle the radar's power -- Toggle the radar's power
RADAR:TogglePower() RADAR:TogglePower()
cb({})
end ) end )
-- Runs when the user presses the ESC or RMB when the remote is open -- Runs when the user presses the ESC or RMB when the remote is open
RegisterNUICallback( "closeRemote", function() RegisterNUICallback( "closeRemote", function( data, cb )
-- Remove focus to the NUI side -- Remove focus to the NUI side
SetNuiFocus( false, false ) SetNuiFocus( false, false )
cb({})
end ) end )
-- Runs when the user presses any of the antenna mode buttons on the remote -- Runs when the user presses any of the antenna mode buttons on the remote
RegisterNUICallback( "setAntennaMode", function( data ) RegisterNUICallback( "setAntennaMode", function( data, cb )
-- Only run the codw if the radar has power and is not powering up -- Only run the codw if the radar has power and is not powering up
if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then
-- As the mode buttons are used to exit the menu, we check for that -- As the mode buttons are used to exit the menu, we check for that
@@ -1465,10 +1468,11 @@ RegisterNUICallback( "setAntennaMode", function( data )
end ) end )
end end
end end
cb({})
end ) end )
-- Runs when the user presses either of the XMIT/HOLD buttons on the remote -- Runs when the user presses either of the XMIT/HOLD buttons on the remote
RegisterNUICallback( "toggleAntenna", function( data ) RegisterNUICallback( "toggleAntenna", function( data, cb )
-- Only run the codw if the radar has power and is not powering up -- Only run the codw if the radar has power and is not powering up
if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then
-- As the xmit/hold buttons are used to change settings in the menu, we check for that -- As the xmit/hold buttons are used to change settings in the menu, we check for that
@@ -1489,10 +1493,11 @@ RegisterNUICallback( "toggleAntenna", function( data )
end ) end )
end end
end end
cb({})
end ) end )
-- Runs when the user presses the menu button on the remote control -- Runs when the user presses the menu button on the remote control
RegisterNUICallback( "menu", function() RegisterNUICallback( "menu", function( data, cb )
-- Only run the codw if the radar has power and is not powering up -- Only run the codw if the radar has power and is not powering up
if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then if ( RADAR:IsPowerOn() and not RADAR:IsPoweringUp() ) then
-- As the menu button is a multipurpose button, we first check to see if the menu is already open -- As the menu button is a multipurpose button, we first check to see if the menu is already open
@@ -1510,17 +1515,20 @@ RegisterNUICallback( "menu", function()
-- Play the standard audio beep -- Play the standard audio beep
SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } ) SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } )
end end
cb({})
end ) end )
-- Runs when the JavaScript side sends the UI data for saving -- Runs when the JavaScript side sends the UI data for saving
RegisterNUICallback( "saveUiData", function( data, cb ) RegisterNUICallback( "saveUiData", function( data, cb )
UTIL:Log( "Saving updated UI settings data." ) UTIL:Log( "Saving updated UI settings data." )
SetResourceKvp( "wk_wars2x_ui_data", json.encode( data ) ) SetResourceKvp( "wk_wars2x_ui_data", json.encode( data ) )
cb({})
end ) end )
-- Runs when the JavaScript side sends the quick start video has been watched -- Runs when the JavaScript side sends the quick start video has been watched
RegisterNUICallback( "qsvWatched", function( data, cb ) RegisterNUICallback( "qsvWatched", function( data, cb )
SetResourceKvpInt( "wk_wars2x_new_user", 1 ) SetResourceKvpInt( "wk_wars2x_new_user", 1 )
cb({})
end ) end )