scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: use utility for whitespace-testing

Browse source
This commit is contained in:
jokebookservice1 2018-10-10 18:36:06 +01:00
parent c90e033148
commit df78a8345e
No known key found for this signature in database
GPG key ID: A872407E9C478467
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/blocks/scratch3_looks.js
View file

@ -353,6 +353,7 @@ class Scratch3LooksBlocks {
*/
_setCostume (target, requestedCostume, optZeroIndex) {
if (typeof requestedCostume === 'number') {
// Numbers should be treated as comments, always
target.setCostume(optZeroIndex ? requestedCostume : requestedCostume - 1);
} else {
const costumeIndex = target.getCostumeIndexByName(requestedCostume.toString());
@ -363,8 +364,10 @@ class Scratch3LooksBlocks {
target.setCostume(target.currentCostume + 1);
} else if (requestedCostume === 'previous costume') {
target.setCostume(target.currentCostume - 1);
} else if (!isNaN(requestedCostume) &&
(typeof requestedCostume !== 'string' || /\d/g.test(requestedCostume))) {
// Try to cast the string to a number (and treat it as a costume index)
// 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);
}
}