hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid json errors in firefox

Browse source
This commit is contained in:
Jade (Rose) Rowland 2024-01-19 23:04:41 -05:00
parent af52ac30ba
commit 0a349e1707
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
website/src/repl/panel/PatternsTab.jsx
View file

@ -10,6 +10,7 @@ import {
import { useMemo } from 'react';
import { getMetadata } from '../../metadata_parser';
import { useExamplePatterns } from '../useExamplePatterns';
import { parseJSON } from '../util.mjs';
function classNames(...classes) {
return classes.filter(Boolean).join(' ');
@ -42,7 +43,7 @@ function PatternButton({ showOutline, onClick, pattern, showHiglight }) {
function PatternButtons({ patterns, activePattern, onClick, started }) {
const viewingPatternStore = useViewingPatternData();
const viewingPatternData = JSON.parse(viewingPatternStore);
const viewingPatternData = parseJSON(viewingPatternStore);
const viewingPatternID = viewingPatternData.id;
return (
<div className="font-mono text-sm">
@ -76,7 +77,7 @@ function ActionButton({ children, onClick, label, labelIsHidden }) {
export function PatternsTab({ context }) {
const activePattern = useActivePattern();
const viewingPatternStore = useViewingPatternData();
const viewingPatternData = JSON.parse(viewingPatternStore);
const viewingPatternData = parseJSON(viewingPatternStore);
const { userPatterns } = useSettings();
const examplePatterns = useExamplePatterns();
@ -164,7 +165,7 @@ export function PatternsTab({ context }) {
<h2 className="text-xl mb-2">{collection}</h2>
<div className="font-mono text-sm">
<PatternButtons
onClick={(id) => updateCodeWindow({ ...patterns[id], collection }, true)}
onClick={(id) => updateCodeWindow({ ...patterns[id], collection }, false)}
started={context.started}
patterns={patterns}
activePattern={activePattern}

9
website/src/repl/util.mjs
View file

@ -52,6 +52,15 @@ export async function initCode() {
}
}
export const parseJSON = (json) => {
json = json != null && json.length ? json : '{}';
try {
return JSON.parse(json);
} catch {
return '{}';
}
};
export function getRandomTune() {
const allTunes = Object.entries(stockPatterns);
const randomItem = (arr) => arr[Math.floor(Math.random() * arr.length)];