GithubMirrors/cardconjurer
1
0
Fork 1
mirror of https://github.com/Investigamer/cardconjurer.git synced 2025-10-31 07:10:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Kyle
2019-11-28 20:05:13 -08:00
parent 25bbfa35b9
commit cf1e8fe0a3
5 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/scripts/main.js
View File

@@ -16,7 +16,7 @@ function initiate() {
window.cardWidth = 750;
window.cardHeight = 1050;
window.frameList = new Array();
window.maskNameList = ["Right Half", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame"];
window.maskNameList = ["Right Half", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame", "Border"];
window.maskList = [];
window.selectedFrame = -1;
window.selectedMask = "";
@@ -88,12 +88,8 @@ class frameImage {
this.heightList[i] = scale(parseInt(splitIndividualMasks[4]));
}
}
cardMasterElement(targetMask, right) {
var extraMask = ""
if (right) {
extraMask = " - Right"
}
return "<div id='frameIndex" + frameList.indexOf(this) + "' class='cardMasterElement'>" + this.displayName + " (" + targetMask + extraMask + ")<span class='closeCardMasterElement' onclick='deleteCardMasterElement(event)'>x</span></div>";
cardMasterElement(targetMask) {
return "<div id='frameIndex" + frameList.indexOf(this) + "' class='cardMasterElement'>" + this.displayName + " (" + targetMask + ")<img class='cardMasterElementMaskImage' src=" + this.image.src + "><img src=" + maskList[maskNameList.indexOf(targetMask.replace(" - Right", ""))].src + "><span class='closeCardMasterElement' onclick='deleteCardMasterElement(event)'>x</span></div>";
}
framePickerElement(targetElement) {
return "<div id='frameIndex" + frameList.indexOf(this) + "' class='frameOption' onclick='frameOptionClicked(event)'><img src=" + this.image.src + "></div>";
@@ -138,10 +134,10 @@ function maskOptionClicked(event) {
clickedElement.classList.add("maskOptionSelected");
selectedMask = clickedElement.id.replace("maskName", "");
}
function addFrameToCardMaster(right = false) {
function addFrameToCardMaster(right = "") {
//Takes the stored selectedFrame and selectedMask to add the frame w/ mask to the card master!
if (selectedFrame > -1 && selectedMask != "") {
cardMaster.innerHTML = frameList[selectedFrame].cardMasterElement(selectedMask, right) + cardMaster.innerHTML;
cardMaster.innerHTML = frameList[selectedFrame].cardMasterElement(selectedMask + right) + cardMaster.innerHTML;
cardMasterUpdated();
}
}

3
data/scripts/sortable.js
View File

@@ -2155,6 +2155,9 @@ Sortable.prototype =
if (moved && !awaitingDragStarted) {
toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
//code added by me (Kyle) starts here!
cardMasterUpdated()
//code added by me (Kyle) ends here!
}
toggleClass(dragEl, this.options.chosenClass, false); // Drag stop event