forked from GithubMirrors/cardconjurer
		
	test
This commit is contained in:
		@@ -15,6 +15,7 @@ function drawMask(img, x, y, width, height, targetContext, imgMask, secondMask,
 | 
			
		||||
			maskContext.globalCompositeOperation = "source-in"
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
    console.log(width + ", " + height + " --- " + imgMask.width + ", " + imgMask.height + " --- " + img.width + ", " + img.height)
 | 
			
		||||
	maskContext.drawImage(imgMask, 0, 0, width, height)
 | 
			
		||||
	maskContext.globalCompositeOperation = "source-in"
 | 
			
		||||
	if (img.src == undefined) {
 | 
			
		||||
@@ -24,4 +25,4 @@ function drawMask(img, x, y, width, height, targetContext, imgMask, secondMask,
 | 
			
		||||
		maskContext.drawImage(img, 0, 0, width, height)
 | 
			
		||||
	}
 | 
			
		||||
	targetContext.drawImage(mask, x, y, width, height)
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -612,7 +612,8 @@ function cardClock() {
 | 
			
		||||
	//Draws the card image, then...
 | 
			
		||||
	drawPicture()
 | 
			
		||||
	//draws the card frame on top
 | 
			
		||||
	if (transparentBorder == false) {
 | 
			
		||||
	if (transparentBorder != true) {
 | 
			
		||||
        //console.log(cardWidth + " " + cardHeight)
 | 
			
		||||
		drawMask(imgBorder, 0, 0, cardWidth, cardHeight, card, imgArtMask, false, false)
 | 
			
		||||
	} else {
 | 
			
		||||
		card.drawImage(imgBorder, 0, 0, cardWidth, cardHeight)
 | 
			
		||||
@@ -1280,4 +1281,4 @@ function downloadCardImage(linkElement) {
 | 
			
		||||
}
 | 
			
		||||
</script>
 | 
			
		||||
<script src="data/scripts/whiteToTransparent.js"></script>
 | 
			
		||||
<html>
 | 
			
		||||
<html>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user