anonymous

data/scripts/main.js

@@ -22,6 +22,7 @@ var usedManaSymbols = []
 var totalShift = [0, 0]
 date = new Date()
 var cornerCutout = new Image()
+cornerCutout.crossOrigin = 'anonymous';
 cornerCutout.src = '/data/images/cardImages/cornerCutout.png'
 //To save the server from being overloaded? Maybe?
 function fixUri(input) {
@@ -42,10 +43,12 @@ function addToManaSymbolList(folderPath, newManaSymbolList) {
 			if (newManaSymbolList[i].includes('.svg')) {
 				manaSymbolCodeList.push(newManaSymbolList[i].replace('.svg', ''))
 				manaSymbolImageList.push(new Image())
+				manaSymbolImageList[manaSymbolImageList.length - 1].crossOrigin = 'anonymous';
 				manaSymbolImageList[manaSymbolImageList.length - 1].src = fixUri(folderPath + newManaSymbolList[i])
 			} else {
 				manaSymbolCodeList.push(newManaSymbolList[i])
 				manaSymbolImageList.push(new Image())
+				manaSymbolImageList[manaSymbolImageList.length - 1].crossOrigin = 'anonymous';
 				manaSymbolImageList[manaSymbolImageList.length - 1].src = fixUri(folderPath + newManaSymbolList[i] + '.png')
 			}
 		}
@@ -85,14 +88,14 @@ var artWidth = cardWidth, artHeight = cardHeight
 var setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight
 var watermarkDrawX = 0, watermarkDrawY = 0, watermarkDrawWidth = 0, watermarkDrawHeight = 0
 var cardArt = new Image()
+cardArt.crossOrigin = 'anonymous';
 cardArt.src = fixUri('/data/images/cardImages/blank.png')
 var setSymbol = new Image()
+setSymbol.crossOrigin = 'anonymous';
 setSymbol.src = fixUri('/data/images/cardImages/blank.png')
 var watermark = new Image()
+watermark.crossOrigin = 'anonymous';
 watermark.src = fixUri('/data/images/cardImages/blank.png')
-cardArt.crossOrigin = "anonymous"
-setSymbol.crossOrigin = "anonymous"
-watermark.crossOrigin = "anonymous"
 cardArt.onload = function() {
 	cardMasterList[0].width = this.width / cardWidth
 	cardMasterList[0].height = this.height / cardHeight
@@ -208,6 +211,7 @@ 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.crossOrigin = 'anonymous';
 		this.image.src = fixUri(imageSource)
 		this.imageSource = fixUri(imageSource)
 		this.x = x
@@ -329,9 +333,8 @@ class frameImage {
 	constructor(displayName = 'custom', imageSource = '', x = 0, y = 0, width = 1, height = 1, masks = [], frameImageListIndex, frameClass) {
 		this.name = displayName
 		this.image = new Image()
-		if (this.name == 'custom') {
+		this.image
 		this.image.crossOrigin = 'anonymous'
-		}
 		this.image.src = fixUri(imageSource)
 		this.x = x
 		this.y = y
@@ -389,6 +392,7 @@ function loadMaskImages(listOfMasks) {
 	for (var i = 0; i < listOfMasks.length; i++) {
 		if (!maskNameList.includes(listOfMasks[i][0])) {
 			var maskImage = new Image()
+			maskImage.crossOrigin = 'anonymous';
 			maskImage.src = fixUri(listOfMasks[i][1])
 			maskImageList.push(maskImage)
 			maskNameList.push(listOfMasks[i][0])

js/creator.js

@@ -13,20 +13,20 @@ function fixUri(input) {
 var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:'/img/blank.png', artX:0, artY:0, artZoom:1, setSymbolSource:'/img/blank.png', setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:'/img/blank.png', watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]};
 //art
 art = new Image();
-art.src = fixUri('/img/blank.png');
 art.crossOrigin = 'anonymous';
+art.src = fixUri('/img/blank.png');
 art.onerror = function() {this.src = fixUri('/img/blank.png');}
 art.onload = artEdited;
 //set symbol
-setSymbol = new Image()
+setSymbol = new Image();
-setSymbol.src = fixUri('/img/blank.png');
 setSymbol.crossOrigin = 'anonymous';
+setSymbol.src = fixUri('/img/blank.png');
 setSymbol.onerror = function() {this.src = fixUri('/img/blank.png');}
 setSymbol.onload = setSymbolEdited;
 //watermark
-watermark = new Image()
+watermark = new Image();
-watermark.src = fixUri('/img/blank.png');
 watermark.crossOrigin = 'anonymous';
+watermark.src = fixUri('/img/blank.png');
 watermark.onerror = function() {this.src = fixUri('/img/blank.png');}
 watermark.onload = watermarkEdited;
 //preview canvas
@@ -40,10 +40,15 @@ var selectedMaskIndex = 0;
 var selectedTextIndex = 0;
 //core images/masks
 const black = new Image(); black.src = fixUri('/img/black.png');
+black.crossOrigin = 'anonymous';
 const blank = new Image(); blank.src = fixUri('/img/blank.png');
+blank.crossOrigin = 'anonymous';
 const right = new Image(); right.src = fixUri('/img/frames/maskRightHalf.png');
+right.crossOrigin = 'anonymous';
 const middle = new Image(); middle.src = fixUri('/img/frames/maskMiddleThird.png');
+middle.crossOrigin = 'anonymous';
 const corner = new Image(); corner.src = fixUri('/img/frames/cornerCutout.png');
+corner.crossOrigin = 'anonymous';
 //for imports
 var scryfallArt;
 var scryfallCard;
@@ -206,6 +211,7 @@ function loadManaSymbols(manaSymbolPaths, size = [1, 1]) {
 		manaSymbol.width = size[0];
 		manaSymbol.height = size[1];
 		manaSymbol.image = new Image();
+		manaSymbol.image.crossOrigin = 'anonymous';
 		var manaSymbolPath = '/img/manaSymbols/' + item;
 		if (!manaSymbolPath.includes('.png')) {
 			manaSymbolPath += '.svg';
@@ -335,11 +341,13 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
 	}
 	frameToAdd.masks.forEach(item => {
 		item.image = new Image();
+		item.image.crossOrigin = 'anonymous';
 		item.image.src = fixUri('/img/blank.png');
 		item.image.onload = drawFrames;
 		item.image.src = fixUri(item.src);
 	});
 	frameToAdd.image = new Image();
+	frameToAdd.crossOrigin = 'anonymous';
 	if (frameToAdd.name == 'Uploaded Image') {
 		frameToAdd.image.crossOrigin = 'anonymous'
 	}