neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Converting to URL objects

This commit is contained in:
John Donaldson 2019-11-07 19:34:53 +00:00
parent 3e079616c1
commit 82b948c5c7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
theme/moth.js
View File

@ -78,7 +78,9 @@ function renderPuzzles(obj) {
} }
function heartbeat(teamId) { function heartbeat(teamId) {
fetch("puzzles.json?id=" + teamId) let url = new URL("puzzles.json", window.location)
url.searchParams.set("id", teamId)
fetch(url)
.then(resp => { .then(resp => {
if (resp.ok) { if (resp.ok) {
resp.json() resp.json()
@ -126,7 +128,9 @@ function drawCacheButton(teamId) {
let headers = new Headers() let headers = new Headers()
headers.append("pragma", "no-cache") headers.append("pragma", "no-cache")
headers.append("cache-control", "no-cache") headers.append("cache-control", "no-cache")
fetch("current_manifest.json?id=" + teamId, {method: "HEAD", headers: headers}) let url = new URL("current_manifest.json", window.location)
url.searchParams.set("id", teamId)
fetch(url, {method: "HEAD", headers: headers})
.then( resp => { .then( resp => {
if (resp.ok) { if (resp.ok) {
cacher.style.disply = "initial" cacher.style.disply = "initial"
@ -147,8 +151,10 @@ async function fetchAll(teamId) {
headers.append("pragma", "no-cache") headers.append("pragma", "no-cache")
headers.append("cache-control", "no-cache") headers.append("cache-control", "no-cache")
requests = [] requests = []
let url = new URL("current_manifest.json", window.location)
url.searchParams.set("id", teamId)
requests.push( fetch("current_manifest.json?id=" + teamId, {headers: headers}) requests.push( fetch(url, {headers: headers})
.then( resp => { .then( resp => {
if (resp.ok) { if (resp.ok) {
resp.json() resp.json()
@ -180,7 +186,10 @@ async function fetchAll(teamId) {
} }
let puzzles = categories[cat_name] let puzzles = categories[cat_name]
for (let puzzle of puzzles) { for (let puzzle of puzzles) {
let url = "puzzle.html?cat=" + cat_name + "&points=" + puzzle[0] + "&pid=" + puzzle[1] let url = new URL("puzzle.html", window.location)
url.searchParams.set("cat", cat_name)
url.searchParams.set("points", puzzle[0])
url.searchParams.set("pid", puzzle[1])
requests.push( fetch(url) requests.push( fetch(url)
.then( e => { .then( e => {
console.log("Fetched " + url) console.log("Fetched " + url)