From 17617361688690af48387665ae063184f570e8bb Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Sat, 17 Jul 2021 21:05:30 -0700 Subject: [PATCH] cross-origin hotfix --- creator/index.php | 2 +- js/{creator-21.js => creator-22.js} | 4 +++ js/frames/versionClass.js | 2 +- js/frames/versionDungeon.js | 56 ++++++++++++++--------------- js/frames/versionPlaneswalker.js | 26 +++++++------- js/frames/versionSaga.js | 4 +-- 6 files changed, 49 insertions(+), 45 deletions(-) rename js/{creator-21.js => creator-22.js} (99%) diff --git a/creator/index.php b/creator/index.php index 5b413093..e6b9119f 100644 --- a/creator/index.php +++ b/creator/index.php @@ -572,5 +572,5 @@ include('../globalHTML/header-1.php'); - + diff --git a/js/creator-21.js b/js/creator-22.js similarity index 99% rename from js/creator-21.js rename to js/creator-22.js index 2ff6f895..f167f935 100644 --- a/js/creator-21.js +++ b/js/creator-22.js @@ -15,6 +15,10 @@ function fixUri(input) { return prefix + input; //input.replace('/img/frames', prefix + '/img/frames'); } } +function setImageUrl(image, source) { + image.crossOrigin = 'anonymous'; + image.src = fixUri(source); +} //card object var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:fixUri('/img/blank.png'), artX:0, artY:0, artZoom:1, artRotate:0, setSymbolSource:fixUri('/img/blank.png'), setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:fixUri('/img/blank.png'), watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]}; //core images/masks diff --git a/js/frames/versionClass.js b/js/frames/versionClass.js index e6a2d29b..23e6280e 100644 --- a/js/frames/versionClass.js +++ b/js/frames/versionClass.js @@ -31,7 +31,7 @@ if (!loadedVersions.includes('/js/frames/versionClass.js')) { } document.querySelector('#creator-menu-sections').appendChild(newHTML); var classHeader = new Image(); - classHeader.src = fixUri('/img/frames/class/header.png'); + setImageUrl(classHeader, '/img/frames/class/header.png'); classHeader.onload = classEdited; fixClassInputs(classEdited); } else { diff --git a/js/frames/versionDungeon.js b/js/frames/versionDungeon.js index 8f98b85d..78da78dc 100644 --- a/js/frames/versionDungeon.js +++ b/js/frames/versionDungeon.js @@ -27,34 +27,34 @@ if (!loadedVersions.includes('/js/frames/versionDungeon.js')) { card.dungeon = {abilities:[1, 1, 1, 0], count:3, x:0.1, width:0.3947}; } document.querySelector('#creator-menu-sections').appendChild(newHTML); - var dungeonFXtop = new Image(); dungeonFXtop.src = fixUri('/img/frames/dungeon/walls/fx/top.png'); - var dungeonFXleft = new Image(); dungeonFXleft.src = fixUri('/img/frames/dungeon/walls/fx/left.png'); - var dungeonFXbottom = new Image(); dungeonFXbottom.src = fixUri('/img/frames/dungeon/walls/fx/bottom.png'); - var dungeonFXright = new Image(); dungeonFXright.src = fixUri('/img/frames/dungeon/walls/fx/right.png'); - var dungeonFXtopright = new Image(); dungeonFXtopright.src = fixUri('/img/frames/dungeon/walls/fx/topright.png'); - var dungeonFXtopleft = new Image(); dungeonFXtopleft.src = fixUri('/img/frames/dungeon/walls/fx/topleft.png'); - var dungeonFXbottomright = new Image(); dungeonFXbottomright.src = fixUri('/img/frames/dungeon/walls/fx/bottomright.png'); - var dungeonFXbottomleft = new Image(); dungeonFXbottomleft.src = fixUri('/img/frames/dungeon/walls/fx/bottomleft.png'); - var dungeonShapetop = new Image(); dungeonShapetop.src = fixUri('/img/frames/dungeon/walls/shape/top.png'); - var dungeonShapeleft = new Image(); dungeonShapeleft.src = fixUri('/img/frames/dungeon/walls/shape/left.png'); - var dungeonShapebottom = new Image(); dungeonShapebottom.src = fixUri('/img/frames/dungeon/walls/shape/bottom.png'); - var dungeonShaperight = new Image(); dungeonShaperight.src = fixUri('/img/frames/dungeon/walls/shape/right.png'); - var dungeonShapetopright = new Image(); dungeonShapetopright.src = fixUri('/img/frames/dungeon/walls/shape/topright.png'); - var dungeonShapetopleft = new Image(); dungeonShapetopleft.src = fixUri('/img/frames/dungeon/walls/shape/topleft.png'); - var dungeonShapebottomright = new Image(); dungeonShapebottomright.src = fixUri('/img/frames/dungeon/walls/shape/bottomright.png'); - var dungeonShapebottomleft = new Image(); dungeonShapebottomleft.src = fixUri('/img/frames/dungeon/walls/shape/bottomleft.png'); - var dungeonDoorwayShape = new Image(); dungeonDoorwayShape.src = fixUri('/img/frames/dungeon/walls/shape/doorway.png'); - var dungeonDoorwayFX = new Image(); dungeonDoorwayFX.src = fixUri('/img/frames/dungeon/walls/fx/doorway.png'); - var dungeonDoorwayArrow = new Image(); dungeonDoorwayArrow.src = fixUri('/img/frames/dungeon/walls/arrow.png'); - var dungeonDoorwayCutout = new Image(); dungeonDoorwayCutout.src = fixUri('/img/frames/dungeon/walls/doorway.png'); - var dungeonOuterShape = new Image(); dungeonOuterShape.src = fixUri('/img/frames/dungeon/walls/shape/outer.png'); - var dungeonOuterFX = new Image(); dungeonOuterFX.src = fixUri('/img/frames/dungeon/walls/fx/outer.png'); - var dungeonTextureW = new Image(); dungeonTextureW.src = fixUri('/img/frames/dungeon/walls/textures/w.png'); - var dungeonTextureU = new Image(); dungeonTextureU.src = fixUri('/img/frames/dungeon/walls/textures/u.png'); - var dungeonTextureB = new Image(); dungeonTextureB.src = fixUri('/img/frames/dungeon/walls/textures/b.png'); - var dungeonTextureR = new Image(); dungeonTextureR.src = fixUri('/img/frames/dungeon/walls/textures/r.png'); - var dungeonTextureG = new Image(); dungeonTextureG.src = fixUri('/img/frames/dungeon/walls/textures/g.png'); - var dungeonTextureC = new Image(); dungeonTextureC.src = fixUri('/img/frames/dungeon/walls/textures/c.png'); + var dungeonFXtop = new Image(); setImageUrl(dungeonFXtop, '/img/frames/dungeon/walls/fx/top.png'); + var dungeonFXleft = new Image(); setImageUrl(dungeonFXleft, '/img/frames/dungeon/walls/fx/left.png'); + var dungeonFXbottom = new Image(); setImageUrl(dungeonFXbottom, '/img/frames/dungeon/walls/fx/bottom.png'); + var dungeonFXright = new Image(); setImageUrl(dungeonFXright, '/img/frames/dungeon/walls/fx/right.png'); + var dungeonFXtopright = new Image(); setImageUrl(dungeonFXtopright, '/img/frames/dungeon/walls/fx/topright.png'); + var dungeonFXtopleft = new Image(); setImageUrl(dungeonFXtopleft, '/img/frames/dungeon/walls/fx/topleft.png'); + var dungeonFXbottomright = new Image(); setImageUrl(dungeonFXbottomright, '/img/frames/dungeon/walls/fx/bottomright.png'); + var dungeonFXbottomleft = new Image(); setImageUrl(dungeonFXbottomleft, '/img/frames/dungeon/walls/fx/bottomleft.png'); + var dungeonShapetop = new Image(); setImageUrl(dungeonShapetop, '/img/frames/dungeon/walls/shape/top.png'); + var dungeonShapeleft = new Image(); setImageUrl(dungeonShapeleft, '/img/frames/dungeon/walls/shape/left.png'); + var dungeonShapebottom = new Image(); setImageUrl(dungeonShapebottom, '/img/frames/dungeon/walls/shape/bottom.png'); + var dungeonShaperight = new Image(); setImageUrl(dungeonShaperight, '/img/frames/dungeon/walls/shape/right.png'); + var dungeonShapetopright = new Image(); setImageUrl(dungeonShapetopright, '/img/frames/dungeon/walls/shape/topright.png'); + var dungeonShapetopleft = new Image(); setImageUrl(dungeonShapetopleft, '/img/frames/dungeon/walls/shape/topleft.png'); + var dungeonShapebottomright = new Image(); setImageUrl(dungeonShapebottomright, '/img/frames/dungeon/walls/shape/bottomright.png'); + var dungeonShapebottomleft = new Image(); setImageUrl(dungeonShapebottomleft, '/img/frames/dungeon/walls/shape/bottomleft.png'); + var dungeonDoorwayShape = new Image(); setImageUrl(dungeonDoorwayShape, '/img/frames/dungeon/walls/shape/doorway.png'); + var dungeonDoorwayFX = new Image(); setImageUrl(dungeonDoorwayFX, '/img/frames/dungeon/walls/fx/doorway.png'); + var dungeonDoorwayArrow = new Image(); setImageUrl(dungeonDoorwayArrow, '/img/frames/dungeon/walls/arrow.png'); + var dungeonDoorwayCutout = new Image(); setImageUrl(dungeonDoorwayCutout, '/img/frames/dungeon/walls/doorway.png'); + var dungeonOuterShape = new Image(); setImageUrl(dungeonOuterShape, '/img/frames/dungeon/walls/shape/outer.png'); + var dungeonOuterFX = new Image(); setImageUrl(dungeonOuterFX, '/img/frames/dungeon/walls/fx/outer.png'); + var dungeonTextureW = new Image(); setImageUrl(dungeonTextureW, '/img/frames/dungeon/walls/textures/w.png'); + var dungeonTextureU = new Image(); setImageUrl(dungeonTextureU, '/img/frames/dungeon/walls/textures/u.png'); + var dungeonTextureB = new Image(); setImageUrl(dungeonTextureB, '/img/frames/dungeon/walls/textures/b.png'); + var dungeonTextureR = new Image(); setImageUrl(dungeonTextureR, '/img/frames/dungeon/walls/textures/r.png'); + var dungeonTextureG = new Image(); setImageUrl(dungeonTextureG, '/img/frames/dungeon/walls/textures/g.png'); + var dungeonTextureC = new Image(); setImageUrl(dungeonTextureC, '/img/frames/dungeon/walls/textures/c.png'); dungeonTextureC.onload = dungeonEditedBuffer; } diff --git a/js/frames/versionPlaneswalker.js b/js/frames/versionPlaneswalker.js index a94d50ec..ec78be91 100644 --- a/js/frames/versionPlaneswalker.js +++ b/js/frames/versionPlaneswalker.js @@ -43,18 +43,18 @@ if (!loadedVersions.includes('/js/frames/versionPlaneswalker.js')) { window.planeswalkerAbilityLayout = [[[0.7467], [0.6953, 0.822], [0.6639, 0.7467, 0.8362], [0.6505, 0.72, 0.7905, 0.861]],[[0.72], [0.6391, 0.801], [0.5986, 0.72, 0.8415], [0.5986, 0.6796, 0.7605, 0.8415]]]; document.querySelector('#creator-menu-sections').appendChild(newHTML); var plusIcon = new Image(); - plusIcon.src = fixUri('/img/frames/planeswalker/planeswalkerPlus.png'); + setImageUrl(plusIcon, '/img/frames/planeswalker/planeswalkerPlus.png'); var minusIcon = new Image(); - minusIcon.src = fixUri('/img/frames/planeswalker/planeswalkerMinus.png'); + setImageUrl(minusIcon, '/img/frames/planeswalker/planeswalkerMinus.png'); var neutralIcon = new Image(); - neutralIcon.src = fixUri('/img/frames/planeswalker/planeswalkerNeutral.png'); + setImageUrl(neutralIcon, '/img/frames/planeswalker/planeswalkerNeutral.png'); var lightToDark = new Image(); - lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOdd.png'); + setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOdd.png'); var darkToLight = new Image(); - darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEven.png'); + setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEven.png'); var planeswalkerTextMask = new Image(); planeswalkerTextMask.onload = function(){fixPlaneswalkerInputs(planeswalkerEdited);} - planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/planeswalkerMaskText.png'); + setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/planeswalkerMaskText.png'); var lightColor = 'white'; var darkColor = '#a4a4a4'; } else { @@ -66,15 +66,15 @@ function planeswalkerEdited() { if (card.version == 'planeswalkerTall') { planeswalkerTall = 1; if (!planeswalkerTextMask.src.includes('tall')) { - planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/tall/planeswalkerTallMaskRules.png'); + setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/tall/planeswalkerTallMaskRules.png'); } } else if (card.version == 'planeswalkerMDFC') { if (!planeswalkerTextMask.src.includes('mdfc')) { - planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/mdfc/text.svg'); + setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/mdfc/text.svg'); } } else { if (planeswalkerTextMask.src.includes('tall') || planeswalkerTextMask.src.includes('mdfc')) { - planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/planeswalkerMaskText.png'); + setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/planeswalkerMaskText.png'); } } card.planeswalker.abilities[0] = document.querySelector('#planeswalker-cost-0').value; @@ -191,12 +191,12 @@ function invertPlaneswalkerColors(reverse = false) { if (card.planeswalker.invert) { darkColor = '#5b5b5b'; lightColor = 'black'; - lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOddDarkened.png'); - darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEvenDarkened.png'); + setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOddDarkened.png'); + setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEvenDarkened.png'); } else { darkColor = '#a4a4a4'; lightColor = 'white'; - lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOdd.png'); - darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEven.png'); + setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOdd.png'); + setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEven.png'); } } \ No newline at end of file diff --git a/js/frames/versionSaga.js b/js/frames/versionSaga.js index 86434ab7..91551b93 100644 --- a/js/frames/versionSaga.js +++ b/js/frames/versionSaga.js @@ -35,9 +35,9 @@ if (!loadedVersions.includes('/js/frames/versionSaga.js')) { } document.querySelector('#creator-menu-sections').appendChild(newHTML); var sagaChapter = new Image(); - sagaChapter.src = fixUri('/img/frames/saga/sagaChapter.png'); + setImageUrl(sagaChapter, '/img/frames/saga/sagaChapter.png'); var sagaDivider = new Image(); - sagaDivider.src = fixUri('/img/frames/saga/sagaDivider.png'); + setImageUrl(sagaDivider, '/img/frames/saga/sagaDivider.png'); sagaChapter.onload = sagaDivider.onload = sagaEdited; fixSagaInputs(sagaEdited); }