Bug Fix: Change to using Array.from()

robyww · robyww · commit 8b6660c150c2 · 2024-12-12T08:20:53.000-07:00
- Iterator.toArray() not supported on safari and old versions of FF &lt; 131.
diff --git a/src/firefly/js/tables/HpxIndexCntlr.js b/src/firefly/js/tables/HpxIndexCntlr.js
@@ -600,7 +600,7 @@ export function getValuesForOrder(orderData,norder) {
     if (norder<11) return [...orderData[norder]?.tiles[0]?.values()];
     const joinAry= [];
     for(let i=0; (i<orderData[norder]?.tiles.length);i++) {
-       joinAry.push(orderData[norder]?.tiles[i].values().toArray());
+       joinAry.push(Array.from(orderData[norder]?.tiles[i].values()));
     }
     return joinAry.flat();
 }
@@ -609,7 +609,7 @@ export function getKeysForOrder(orderData,norder) {
     if (norder<11) return [...orderData[norder]?.tiles[0]?.keys()];
     const joinAry= [];
     for(let i=0; (i<orderData[norder]?.tiles.length);i++) {
-        joinAry.push(orderData[norder]?.tiles[i].keys().toArray());
+        joinAry.push(Array.from(orderData[norder]?.tiles[i].keys()));
     }
     return joinAry.flat();
 }

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ export function getValuesForOrder(orderData,norder) {`
`600`	`600`	`if (norder<11) return [...orderData[norder]?.tiles[0]?.values()];`
`601`	`601`	`const joinAry= [];`
`602`	`602`	`for(let i=0; (i<orderData[norder]?.tiles.length);i++) {`
`603`		`- joinAry.push(orderData[norder]?.tiles[i].values().toArray());`
	`603`	`+ joinAry.push(Array.from(orderData[norder]?.tiles[i].values()));`
`604`	`604`	`}`
`605`	`605`	`return joinAry.flat();`
`606`	`606`	`}`
`@@ -609,7 +609,7 @@ export function getKeysForOrder(orderData,norder) {`
`609`	`609`	`if (norder<11) return [...orderData[norder]?.tiles[0]?.keys()];`
`610`	`610`	`const joinAry= [];`
`611`	`611`	`for(let i=0; (i<orderData[norder]?.tiles.length);i++) {`
`612`		`- joinAry.push(orderData[norder]?.tiles[i].keys().toArray());`
	`612`	`+ joinAry.push(Array.from(orderData[norder]?.tiles[i].keys()));`
`613`	`613`	`}`
`614`	`614`	`return joinAry.flat();`
`615`	`615`	`}`