Mindfang/cardconjurer
1
0
Fork 0
forked from GithubMirrors/cardconjurer
Code Pull Requests Actions Packages Activity

fixes

Browse Source
This commit is contained in:
Kyle
2020-12-18 10:49:23 -08:00
parent 80907f14ba
commit 07cb9f6da4
6 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
data/scripts/main.js
View File

@@ -23,6 +23,15 @@ var totalShift = [0, 0]
date = new Date()
var cornerCutout = new Image()
cornerCutout.src = '/data/images/cardImages/cornerCutout.png'
//To save the server from being overloaded? Maybe?
function fixUri(input) {
var prefix = 'https://raw.githubusercontent.com/ImKyle4815/cardconjurer/master';
if (input.includes(prefix) || input.includes('http') || params.get('testing')) {
return input;
} else {
return prefix + input;
}
}
//URL Parameters
var URLParams = new URLSearchParams(window.location.search)
@@ -33,11 +42,11 @@ function addToManaSymbolList(folderPath, newManaSymbolList) {
if (newManaSymbolList[i].includes('.svg')) {
manaSymbolCodeList.push(newManaSymbolList[i].replace('.svg', ''))
manaSymbolImageList.push(new Image())
manaSymbolImageList[manaSymbolImageList.length - 1].src = folderPath + newManaSymbolList[i]
manaSymbolImageList[manaSymbolImageList.length - 1].src = fixUri(folderPath + newManaSymbolList[i])
} else {
manaSymbolCodeList.push(newManaSymbolList[i])
manaSymbolImageList.push(new Image())
manaSymbolImageList[manaSymbolImageList.length - 1].src = folderPath + newManaSymbolList[i] + '.png'
manaSymbolImageList[manaSymbolImageList.length - 1].src = fixUri(folderPath + newManaSymbolList[i] + '.png')
}
}
}
@@ -76,11 +85,11 @@ var artWidth = cardWidth, artHeight = cardHeight
var setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight
var watermarkDrawX = 0, watermarkDrawY = 0, watermarkDrawWidth = 0, watermarkDrawHeight = 0
var cardArt = new Image()
cardArt.src = '/data/images/cardImages/blank.png'
cardArt.src = fixUri('/data/images/cardImages/blank.png')
var setSymbol = new Image()
setSymbol.src = '/data/images/cardImages/blank.png'
setSymbol.src = fixUri('/data/images/cardImages/blank.png')
var watermark = new Image()
watermark.src = '/data/images/cardImages/blank.png'
watermark.src = fixUri('/data/images/cardImages/blank.png')
cardArt.crossOrigin = "anonymous"
setSymbol.crossOrigin = "anonymous"
watermark.crossOrigin = "anonymous"
@@ -106,16 +115,16 @@ function setSymbolFromGatherer() {
if (document.getElementById('inputSetRarity').value == '') {
newSetSymbolSource += 'c'
}
setSymbol.src = newSetSymbolSource + '.png'
setSymbol.src = (newSetSymbolSource + '.png')
} else if (document.getElementById('inputSetCode').value.toLowerCase() == 'none') {
setSymbol.src = '/data/images/cardImages/blank.png'
setSymbol.src = ('/data/images/cardImages/blank.png')
} else {
setSymbol.src = 'https://cors-anywhere.herokuapp.com/http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=' + document.getElementById('inputSetCode').value + '&size=large&rarity=' + document.getElementById('inputSetRarity').value
// autoCrop(setSymbol, 'https://cors-anywhere.herokuapp.com/http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=' + document.getElementById('inputSetCode').value + '&size=large&rarity=' + document.getElementById('inputSetRarity').value)
}
}
setSymbol.onerror = function () {
this.src = '/data/images/cardImages/blank.png'
this.src = fixUri('/data/images/cardImages/blank.png')
}
setSymbol.onload = function() {
if (setSymbol.width / setSymbol.height > setSymbolWidth / setSymbolHeight) {
@@ -199,8 +208,8 @@ class cardImage {
constructor(displayName = 'cardImage', imageSource = '/data/images/cardImages/blank.png', x = 0, y = 0, width = 1, height = 1, opacity = 1, masks = ['Full'], erase = false) {
this.name = displayName
this.image = new Image()
this.image.src = imageSource
this.imageSource = imageSource
this.image.src = fixUri(imageSource)
this.imageSource = fixUri(imageSource)
this.x = x
this.y = y
this.width = width
@@ -323,7 +332,7 @@ class frameImage {
if (this.name == 'custom') {
this.image.crossOrigin = 'anonymous'
}
this.image.src = imageSource
this.image.src = fixUri(imageSource)
this.x = x
this.y = y
this.width = width
@@ -380,7 +389,7 @@ function loadMaskImages(listOfMasks) {
for (var i = 0; i < listOfMasks.length; i++) {
if (!maskNameList.includes(listOfMasks[i][0])) {
var maskImage = new Image()
maskImage.src = listOfMasks[i][1]
maskImage.src = fixUri(listOfMasks[i][1])
maskImageList.push(maskImage)
maskNameList.push(listOfMasks[i][0])
}