From 6266bd8ed432baf228cbaeba1878aab1940d2b22 Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 7 Nov 2020 12:35:46 +0000 Subject: [PATCH] NUI callback response formatting --- cl_plate_reader.lua | 4 ++-- cl_radar.lua | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cl_plate_reader.lua b/cl_plate_reader.lua index 5439d51..686d5cf 100644 --- a/cl_plate_reader.lua +++ b/cl_plate_reader.lua @@ -185,14 +185,14 @@ end ) RegisterNUICallback( "togglePlateReaderDisplay", function( data, cb ) -- Toggle the display state READER:ToggleDisplayState() - cb('ok') + cb( "ok" ) end ) -- Runs when the "Set BOLO Plate" button is pressed on the plate reader box RegisterNUICallback( "setBoloPlate", function( plate, cb ) -- Set the BOLO plate READER:SetBoloPlate( plate ) - cb('ok') + cb( "ok" ) end ) -- Runs when the "Clear BOLO Plate" button is pressed on the plate reader box diff --git a/cl_radar.lua b/cl_radar.lua index 8b95cfc..2f5e2ae 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -1436,21 +1436,21 @@ end RegisterNUICallback( "toggleRadarDisplay", function( data, cb ) -- Toggle the display state RADAR:ToggleDisplayState() - cb('ok') + cb( "ok" ) end ) -- Runs when the user presses the power button on the radar ui RegisterNUICallback( "togglePower", function( data, cb ) -- Toggle the radar's power RADAR:TogglePower() - cb('ok') + cb( "ok" ) end ) -- Runs when the user presses the ESC or RMB when the remote is open RegisterNUICallback( "closeRemote", function( data, cb ) -- Remove focus to the NUI side SetNuiFocus( false, false ) - cb('ok') + cb( "ok" ) end ) -- Runs when the user presses any of the antenna mode buttons on the remote @@ -1482,7 +1482,8 @@ RegisterNUICallback( "setAntennaMode", function( data, cb ) end ) end end - cb('ok') + + cb( "ok" ) end ) -- Runs when the user presses either of the XMIT/HOLD buttons on the remote @@ -1507,7 +1508,8 @@ RegisterNUICallback( "toggleAntenna", function( data, cb ) end ) end end - cb('ok') + + cb( "ok" ) end ) -- Runs when the user presses the menu button on the remote control @@ -1529,20 +1531,21 @@ RegisterNUICallback( "menu", function( data, cb ) -- Play the standard audio beep SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } ) end - cb('ok') + + cb( "ok" ) end ) -- Runs when the JavaScript side sends the UI data for saving RegisterNUICallback( "saveUiData", function( data, cb ) UTIL:Log( "Saving updated UI settings data." ) SetResourceKvp( "wk_wars2x_ui_data", json.encode( data ) ) - cb('ok') + cb( "ok" ) end ) -- Runs when the JavaScript side sends the quick start video has been watched RegisterNUICallback( "qsvWatched", function( data, cb ) SetResourceKvpInt( "wk_wars2x_new_user", 1 ) - cb('ok') + cb( "ok" ) end )