Apple-2-Tools
/
apple2js
mirror of https://github.com/whscullin/apple2js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix http json loading

This commit is contained in:
Will Scullin 2022-07-04 15:49:52 -07:00
parent c2b78951a7
commit 7774a2a14a
No known key found for this signature in database
GPG Key ID: 26DCD1042C6638CD
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/components/Drives.tsx
View File

@ -93,7 +93,9 @@ export const Drives = ({ cpu, io, sectors, enhanced, ready }: DrivesProps) => {
for (const drive of [1, 2] as DriveNumber[]) {
if (hashParts && hashParts[drive]) {
const hashPart = decodeURIComponent(hashParts[drive]);
if (hashPart.match(/^https?:/)) {
const isHttp = hashPart.match(/^https?:/i);
const isJson = hashPart.match(/\.json$/i);
if (isHttp && !isJson) {
loading++;
controllers.push(spawn(async (signal) => {
try {
@ -113,7 +115,7 @@ export const Drives = ({ cpu, io, sectors, enhanced, ready }: DrivesProps) => {
setTotal(0);
}));
} else {
const url = `/json/disks/${hashPart}.json`;
const url = isHttp ? hashPart : `/json/disks/${hashPart}.json`;
loadJSON(disk2, drive, url).catch((e) => setError(e));
}
}