scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-05-16 08:20:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Drop useRound option from Cast.toListIndex ()

Browse source 
* Drop `useRound` option from `Cast.toListIndex`

* Param fix
This commit is contained in:
Tim Mickel 2016-09-26 12:01:21 -04:00 • committed by GitHub
parent 96b579a2de
commit 2357d63243
2 changed files with 3 additions and 9 deletions

2
src/blocks/scratch3_data.js
View file

@ -73,7 +73,7 @@ Scratch3DataBlocks.prototype.addToList = function (args, util) {
Scratch3DataBlocks.prototype.deleteOfList = function (args, util) {
var list = util.target.lookupOrCreateList(args.LIST);
var index = Cast.toListIndex(args.INDEX, list.contents.length, true);
var index = Cast.toListIndex(args.INDEX, list.contents.length);
if (index === Cast.LIST_INVALID) {
return;
} else if (index === Cast.LIST_ALL) {

10
src/util/cast.js
View file

@ -134,11 +134,9 @@ Cast.LIST_ALL = 'ALL';
* LIST_INVALID: if the index was invalid in any way.
* @param {*} index Scratch arg, including 1-based numbers or special cases.
* @param {number} length Length of the list.
* @param {boolean} useRound If set, Math.round (not Math.floor for 2.0 compat).
* @return {(number|string)} 1-based index for list, LIST_ALL, or LIST_INVALID.
*/
Cast.toListIndex = function (
index, length, useRound) {
Cast.toListIndex = function (index, length) {
if (typeof index !== 'number') {
if (index == 'all') {
return Cast.LIST_ALL;
@ -155,11 +153,7 @@ Cast.toListIndex = function (
return Cast.LIST_INVALID;
}
}
if (useRound) {
index = Math.round(Cast.toNumber(index));
} else {
index = Math.floor(Cast.toNumber(index));
}
index = Math.floor(Cast.toNumber(index));
if (index < 1 || index > length) {
return Cast.LIST_INVALID;
}