X-Git-Url: https://git.jacobcasper.com/?p=brackets.git;a=blobdiff_plain;f=frontend%2Findex.js;h=8446219f3e691393a9f750f5ecc191ddb92a84c5;hp=d70de4fd36370d10f61884598826fb9d4d0688a0;hb=4b4b1eff98eaf6c8d18c3742a8e35dafccc64151;hpb=e4763c42daa05515fb25e94047803de3c3716a4a diff --git a/frontend/index.js b/frontend/index.js index d70de4f..8446219 100644 --- a/frontend/index.js +++ b/frontend/index.js @@ -96,8 +96,21 @@ const drawMatchup = (canvas, x, y, iter, maxIter, left, artists, baseCallback) = const drawBranchUp = (xDist, yDist) => drawBranchFrom(ctx, x, y, xDist, yDist, left, -1); const drawBranchDown = (xDist, yDist) => drawBranchFrom(ctx, x, y, xDist, yDist, left, 1); const drawArtist = (artistName, x, y) => drawArtistOnCtx(ctx, artistName, x, y); - const drawArtist1 = (x, y) => drawArtist(artists.shift()["name"], x, y); - const drawArtist2 = (x, y) => drawArtist(artists.pop()["name"], x, y); + const drawArtist1 = (x, y) => { + const artist1 = artists.shift(); + if (!artist1) { + return; + } + drawArtist(artist1["name"], x, y); + } + + const drawArtist2 = (x, y) => { + const artist2 = artists.pop(); + if (!artist2) { + return; + } + drawArtist(artist2["name"], x, y); + } ctx.beginPath(); ctx.moveTo(x, y); @@ -140,6 +153,9 @@ const drawBracket = (canvas, artists, genre) => { 1 ); for (let group = 1; group <= groups; group++) { + if (artists.length === 0) { + break; + } drawMatchup( canvas, mid_x + (Math.pow(-1, group) * (rect_width / 6)), @@ -199,7 +215,7 @@ window.onload = () => { canvas.width = window.innerWidth; canvas.height = window.innerHeight; - drawBracket(canvas, ['dummy', 'dummy', 'dum' ,'dumhy'], ""); + drawBracket(canvas, [], ""); const bgImg = new Image(); bgImg.onload = () => {