mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-07-10 13:03:59 -04:00
refactor: use utility for whitespace-testing
This commit is contained in:
parent
c90e033148
commit
df78a8345e
1 changed files with 5 additions and 2 deletions
|
@ -353,6 +353,7 @@ class Scratch3LooksBlocks {
|
||||||
*/
|
*/
|
||||||
_setCostume (target, requestedCostume, optZeroIndex) {
|
_setCostume (target, requestedCostume, optZeroIndex) {
|
||||||
if (typeof requestedCostume === 'number') {
|
if (typeof requestedCostume === 'number') {
|
||||||
|
// Numbers should be treated as comments, always
|
||||||
target.setCostume(optZeroIndex ? requestedCostume : requestedCostume - 1);
|
target.setCostume(optZeroIndex ? requestedCostume : requestedCostume - 1);
|
||||||
} else {
|
} else {
|
||||||
const costumeIndex = target.getCostumeIndexByName(requestedCostume.toString());
|
const costumeIndex = target.getCostumeIndexByName(requestedCostume.toString());
|
||||||
|
@ -363,8 +364,10 @@ class Scratch3LooksBlocks {
|
||||||
target.setCostume(target.currentCostume + 1);
|
target.setCostume(target.currentCostume + 1);
|
||||||
} else if (requestedCostume === 'previous costume') {
|
} else if (requestedCostume === 'previous costume') {
|
||||||
target.setCostume(target.currentCostume - 1);
|
target.setCostume(target.currentCostume - 1);
|
||||||
} else if (!isNaN(requestedCostume) &&
|
// Try to cast the string to a number (and treat it as a costume index)
|
||||||
(typeof requestedCostume !== 'string' || /\d/g.test(requestedCostume))) {
|
// Pure whitespace should not be treated as a number (JS casts this to 0)
|
||||||
|
// Note: isNaN will cast the string to a number before checking if it's NaN
|
||||||
|
} else if (!(isNaN(requestedCostume) || Cast.isWhiteSpace(requestedCostume))) {
|
||||||
target.setCostume(optZeroIndex ? Number(requestedCostume) : Number(requestedCostume) - 1);
|
target.setCostume(optZeroIndex ? Number(requestedCostume) : Number(requestedCostume) - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue