From b657f6c6370eb64faf03fca534178eb758a67302 Mon Sep 17 00:00:00 2001
From: Kyle <41976328+ImKyle4815@users.noreply.github.com>
Date: Mon, 23 Dec 2019 10:06:11 -0800
Subject: [PATCH] fix
---
data/scripts/main.js | 2 +-
data/versions/m15.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/scripts/main.js b/data/scripts/main.js
index e158ef74..f1696d50 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -175,7 +175,7 @@ function frameOptionClicked(event) {
selectedFrame = parseInt(clickedElementIndex);
document.getElementById("maskPicker").innerHTML = "";
for (var i = 0; i < frameList[selectedFrame].maskOptionList.length; i++) {
- console.log(frameList[selectedFrame].maskOptionList);
+// console.log(frameList[selectedFrame].maskOptionList);
document.getElementById("maskPicker").innerHTML += "
].src + ")
" + frameList[selectedFrame].maskOptionList[i] + "
";
}
document.getElementsByClassName("maskOption")[0].classList.add("maskOptionSelected");
diff --git a/data/versions/m15.js b/data/versions/m15.js
index cb8e0c06..cd9620f6 100644
--- a/data/versions/m15.js
+++ b/data/versions/m15.js
@@ -38,7 +38,7 @@ function m15BottomInfo() {
bottomInfoContext.writeText(document.getElementById("inputInfoSet").value + " \u2022 " + document.getElementById("inputInfoLanguage").value + " {font:belerenbsc}{artistBrush}{fontsize1}" + document.getElementById("inputInfoArtist").value, scale(46), scale(1000), scale(375), 0, "gothammedium", 17, "white", "oneLine=true")
var copyrightShift = 0;
for (var i = 0; i < cardMaster.children.length; i++) {
- if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) != -1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT")) {
+ if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) != -1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT") && !frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].framePickerClasses.includes("frameClassCustom")) {
copyrightShift = 19;
}
}