HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 18:50:54 +00:00
Code Actions Packages Releases Activity

BF: importConditions with a selection consisting of a string, e.g. '1,2,3'

Browse Source
This commit is contained in:
Alain Pitiot 2022-02-22 10:54:00 +01:00
parent 08a39b3b45
commit 590911c1c3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/Util.js
View File

@ -813,27 +813,29 @@ export function addInfoFromUrl(info)
*/ */
export function selectFromArray(array, selection) export function selectFromArray(array, selection)
{ {
// if selection is an integer, or a string representing an integer, we treat it as an index in the array // if selection is an integer, or a string representing an integer, we treat it
// and return that entry: // as an index in the array and return that entry:
if (isInt(selection)) if (isInt(selection))
{ {
return [array[parseInt(selection)]]; return [array[parseInt(selection)]];
} }
// if selection is an array, we treat it as a list of indices // if selection is an array, we treat it as a list of indices
// and return an array with the entries corresponding to those indices: // and return an array with the entries corresponding to those indices:
else if (Array.isArray(selection)) else if (Array.isArray(selection))
{ {
// Pick out `array` items matching indices contained in `selection` in order return selection.map( (i) => array[i] );
return selection.map((i) => array[i]);
} }
// if selection is a string, we decode it:
// if selection is a string:
else if (typeof selection === "string") else if (typeof selection === "string")
{ {
if (selection.indexOf(",") > -1) if (selection.indexOf(",") > -1)
{ {
return selection.split(",").map((a) => selectFromArray(array, a)); const selectionAsArray = selection.split(",").map( (i) => parseInt(i) );
return selectFromArray(array, selectionAsArray);
} }
// return flattenArray( selection.split(',').map(a => selectFromArray(array, a)) );
else if (selection.indexOf(":") > -1) else if (selection.indexOf(":") > -1)
{ {
let sliceParams = selection.split(":").map((a) => parseInt(a)); let sliceParams = selection.split(":").map((a) => parseInt(a));