Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-15 17:28:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue in Utils.Objects.GetValue where it would return an incorrect result if a source and altSource were provided that didn't match in structure. Fix #5952

Browse source
This commit is contained in:
Richard Davey 2022-05-06 16:27:00 +01:00
parent 81fc4d33a0
commit e100fd76fa
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/utils/object/GetValue.js
View file

@ -59,7 +59,10 @@ var GetValue = function (source, key, defaultValue, altSource)
var keys = key.split('.');
var parentA = source;
var parentB = altSource;
var value = defaultValue;
var valueA = defaultValue;
var valueB = defaultValue;
var valueAFound = true;
var valueBFound = true;
// Use for loop here so we can break early
for (var i = 0; i < keys.length; i++)
@ -67,26 +70,38 @@ var GetValue = function (source, key, defaultValue, altSource)
if (parentA && parentA.hasOwnProperty(keys[i]))
{
// Yes parentA has a key property, let's carry on down
value = parentA[keys[i]];
valueA = parentA[keys[i]];
parentA = parentA[keys[i]];
}
else if (parentB && parentB.hasOwnProperty(keys[i]))
else
{
valueAFound = false;
}
if (parentB && parentB.hasOwnProperty(keys[i]))
{
// Yes parentB has a key property, let's carry on down
value = parentB[keys[i]];
valueB = parentB[keys[i]];
parentB = parentB[keys[i]];
}
else
{
// Can't go any further, so reset to default
value = defaultValue;
break;
valueBFound = false;
}
}
return value;
if (valueAFound)
{
return valueA;
}
else if (valueBFound)
{
return valueB;
}
else
{
return defaultValue;
}
}
else
{