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

user feedback improvements

Browse Source
This commit is contained in:
Kyle
2021-01-27 09:58:15 -08:00
parent 1a452c8266
commit c1a9c437e1
7 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
creator/index.php
View File

@@ -95,7 +95,7 @@ include('../globalHTML/header-1.php');
<option value='Modal'>Short Modal DFC's</option>
<option disabled>Other Frames</option>
<option value='Custom'>Custom</option>
<option value='Misc'>Old/Misc</option>
<option value='Misc-1'>Old/Misc</option>
</select>
<select id='selectFramePack' onchange='loadScript("/js/frames/pack" + this.value + ".js")' class='input'></select>
</div>
@@ -411,5 +411,5 @@ include('../globalHTML/header-1.php');
</h4>
</div>
</div>
<script defer src='/js/creator-6.js'></script>
<script defer src='/js/creator-7.js'></script>
<?php include('../globalHTML/footer.php'); ?>

BIN
img/frames/margins/blackCorners.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
img/frames/margins/blackCornersThumb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

25
js/creator-6.js → js/creator-7.js
View File

@@ -23,7 +23,12 @@ art.onerror = function() {if (!this.src.includes('/img/blank.png')) {this.src =
art.onload = artEdited;
//set symbol
setSymbol = new Image(); setSymbol.crossOrigin = 'anonymous'; setSymbol.src = blank.src;
setSymbol.onerror = function() {if (!this.src.includes('/img/blank.png')) {this.src = fixUri('/img/blank.png');}}
setSymbol.onerror = function() {
if (this.src.includes('gatherer.wizards.com')) {
notify('<a target="_blank" href="http' + this.src.split('http')[2] + '">Loading the set symbol from Gatherer failed. Please check this link to see if it exists. If it does, it may be necessary to manually download and upload the image.</a>', 30);
}
if (!this.src.includes('/img/blank.png')) {this.src = fixUri('/img/blank.png');}
}
setSymbol.onload = setSymbolEdited;
//watermark
watermark = new Image(); watermark.crossOrigin = 'anonymous'; watermark.src = blank.src;
@@ -1079,7 +1084,7 @@ function drawCard() {
//DOWNLOADING
async function downloadCard() {
if (card.infoArtist.replace(/ /g, '') == '' && !card.artSource.includes('/img/blank.png') && !card.artZoom == 0) {
notify('You must credit an artist before downloading!');
notify('You must credit an artist before downloading!', 10);
} else {
var download = document.createElement('a');
var imageName = card.text.title.text;
@@ -1247,16 +1252,16 @@ async function loadCard(selectedCardKey) {
artistEdited(card.infoArtist);
document.querySelector('#text-editor').value = card.text[Object.keys(card.text)[selectedTextIndex]].text;
loadTextOptions(card.text);
document.querySelector('#art-x').value = scaleX(card.artX);
document.querySelector('#art-y').value = scaleY(card.artY);
document.querySelector('#art-x').value = scaleX(card.artX) - scaleWidth(card.marginX);
document.querySelector('#art-y').value = scaleY(card.artY) - scaleHeight(card.marginY);
document.querySelector('#art-zoom').value = card.artZoom * 100;
uploadArt(card.artSource);
document.querySelector('#setSymbol-x').value = scaleX(card.setSymbolX);
document.querySelector('#setSymbol-y').value = scaleY(card.setSymbolY);
document.querySelector('#setSymbol-x').value = scaleX(card.setSymbolX) - scaleWidth(card.marginX);
document.querySelector('#setSymbol-y').value = scaleY(card.setSymbolY) - scaleHeight(card.marginY);
document.querySelector('#setSymbol-zoom').value = card.setSymbolZoom * 100;
uploadSetSymbol(card.setSymbolSource);
document.querySelector('#watermark-x').value = scaleX(card.watermarkX);
document.querySelector('#watermark-y').value = scaleY(card.watermarkY);
document.querySelector('#watermark-x').value = scaleX(card.watermarkX) - scaleWidth(card.marginX);
document.querySelector('#watermark-y').value = scaleY(card.watermarkY) - scaleHeight(card.marginY);
document.querySelector('#watermark-zoom').value = card.watermarkZoom * 100;
document.querySelector('#watermark-left').value = card.watermarkLeft;
document.querySelector('#watermark-right').value = card.watermarkRight;
@@ -1289,7 +1294,7 @@ async function loadCard(selectedCardKey) {
watermarkEdited();
}
} else {
notify(selectedCardKey + ' failed to load.')
notify(selectedCardKey + ' failed to load.', 10)
}
}
function deleteCard() {
@@ -1374,7 +1379,7 @@ function fetchScryfallData(cardName, callback = console.log) {
callback(JSON.parse(this.responseText));
// JSON.parse(this.responseText);
} else if (this.readyState == 4 && this.status == 404) {
notify('No cards found for "' + cardName + '"');
notify('No cards found for "' + cardName + '"', 10);
}
}
xhttp.open('GET', 'https://api.scryfall.com/cards/search?order=released&unique=art&q=name%3D' + cardName.replace(/ /g, '_'), true);

2
js/frames/groupMisc.js → js/frames/groupMisc-1.js
View File

@@ -4,5 +4,5 @@ loadFramePacks([
{name:'Legends Multicolored', value:'Legends'},
{name:'Misc', value:'disabled'},
{name:'Planechase', value:'Planechase'},
{name:'1/8 Inch Margin', value:'Margin'}
{name:'1/8 Inch Margin', value:'Margin-1'}
])

1
js/frames/packMargin.js → js/frames/packMargin-1.js
View File

@@ -5,6 +5,7 @@ availableFrames = [
{name:'Black Border Extension', src:'/img/frames/margins/blackBorderExtension.png', bounds:bounds},
{name:'Borderless Border Extension', src:'/img/frames/margins/borderlessBorderExtension.png', bounds:bounds},
{name:'Box Topper Border Extension', src:'/img/frames/margins/boxTopperBorderExtension.png', bounds:bounds},
{name:'Black Corners', src:'/img/frames/margins/blackCorners.png', bounds:bounds},
];
//disables/enables the "Load Frame Version" button
document.querySelector('#loadFrameVersion').disabled = false;

5
js/main-1.js
View File

@@ -8,7 +8,7 @@ function toggleMenu() {
document.querySelector('.menu').classList.add('menu-visible');
}
}
function notify(message = '') {
function notify(message = '', seconds) {
var notification = document.createElement('div');
notification.classList = 'notification padding';
var notificationMessage = document.createElement('h4');
@@ -19,6 +19,9 @@ function notify(message = '') {
close.onclick = closeNotification;
notification.appendChild(close);
document.querySelector('.notification-container').appendChild(notification);
if (seconds) {
setTimeout(function(){close.click();}, seconds * 1000)
}
}
function closeNotification(event) {
var target = event.target.closest('.notification');