Key lock label now says enabled/disabled instead of toggled

This commit is contained in:
Dan
2020-01-09 10:00:36 +00:00
parent 995d2f8ff4
commit 4e88a4ff34
4 changed files with 18 additions and 10 deletions

View File

@@ -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

View File

@@ -737,3 +737,6 @@ button:focus { outline: none; }
z-index: 4;
}
#keyLockLabel span {
font-size: 30px;
}

View File

@@ -200,7 +200,7 @@
<button id="closeUiSettings" class="close">CLOSE</button>
</div>
<p id="keyLockLabel">Radar key lock toggled</p>
<p id="keyLockLabel">Radar key lock <span id="keyLockStateLabel"></span></p>
<!-- Load JavaScript files -->
<!-- <script src="nui://game/ui/jquery.js"></script> -->

View File

@@ -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;