From 420b023103ea7cbe99eda5cce3ace70c42e00a91 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sun, 10 Mar 2019 09:44:38 -0700 Subject: [PATCH] Don't load preset pack when loading preset from URL --- demo/js/butterchurnOptions.ts | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/demo/js/butterchurnOptions.ts b/demo/js/butterchurnOptions.ts index ef8a5600..63e38523 100644 --- a/demo/js/butterchurnOptions.ts +++ b/demo/js/butterchurnOptions.ts @@ -34,27 +34,25 @@ export function getButterchurnOptions( const params = new URLSearchParams(location.search); const butterchurnPresetUrlParam = params.get("butterchurnPresetUrl"); const milkdropPresetUrl = params.get("milkdropPresetUrl"); - const initialPresets = []; if (butterchurnPresetUrlParam) { - initialPresets.push({ - name: presetNameFromURL(butterchurnPresetUrlParam), - butterchurnPresetUrl: butterchurnPresetUrlParam - }); + return [ + { + name: presetNameFromURL(butterchurnPresetUrlParam), + butterchurnPresetUrl: butterchurnPresetUrlParam + } + ]; } else if (milkdropPresetUrl) { throw new Error("We still need to implement this"); } - const resp = await fetch( - "https://unpkg.com/butterchurn-presets-weekly@0.0.2/weeks/week1/presets.json" - ); - // TODO: Fallback to some other presets? - const namesToPresetUrls = await resp.json(); - const presets = Object.keys(namesToPresetUrls).map((name: string) => { - const butterchurnPresetUrl: string = namesToPresetUrls[name]; - return { name, butterchurnPresetUrl }; - }); - return [...initialPresets, ...presets]; } - return []; + const resp = await fetch( + "https://unpkg.com/butterchurn-presets-weekly@0.0.2/weeks/week1/presets.json" + ); + // TODO: Fallback to some other presets? + const namesToPresetUrls = await resp.json(); + return Object.keys(namesToPresetUrls).map((name: string) => { + return { name, butterchurnPresetUrl: namesToPresetUrls[name] }; + }); }, butterchurnOpen: !startWithMilkdropHidden };