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

Update main.js

Browse Source
This commit is contained in:
Kyle
2019-11-28 16:24:19 -08:00
parent c6e423ca55 14a4104f20
commit 77bd0cd645
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/scripts/main.js
View File

@@ -30,6 +30,7 @@ function initiate() {
document.getElementById("displayCanvas").width = cardWidth; document.getElementById("displayCanvas").width = cardWidth;
document.getElementById("displayCanvas").height = cardHeight; document.getElementById("displayCanvas").height = cardHeight;
window.displayContext = displayCanvas.getContext("2d"); window.displayContext = displayCanvas.getContext("2d");
<<<<<<< HEAD
newCanvas("frameMask"); newCanvas("frameMask");
newCanvas("frameFinal"); newCanvas("frameFinal");
newCanvas("cardFinal"); newCanvas("cardFinal");
@@ -38,6 +39,13 @@ function initiate() {
//initiation is complete, ready to load image data //initiation is complete, ready to load image data
console.log("init done"); console.log("init done");
loadImageCSV(); loadImageCSV();
=======
// loadScript("data/scripts/sortable.js");
import Sortable from "./sortable.js";
var el = document.getElementById('items');
// var sortable = Sortable.create(el);
console.log("init done")
>>>>>>> 14a4104f200c050a672892cadd01502c7e047d63
} }