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

Update main.js

Browse Source
This commit is contained in:
Kyle
2019-11-28 16:27:10 -08:00
parent 77bd0cd645
commit 25bbfa35b9
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/scripts/main.js
View File

@@ -30,22 +30,14 @@ 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");
//Loads up anything that uses Sortable.js //Loads up anything that uses Sortable.js
var sortable = Sortable.create(cardMaster, {animation: 150, ghostClass: "cardMasterElementMoving"}); var sortable = Sortable.create(cardMaster, {animation: 150, ghostClass: "cardMasterElementMoving"});
//initiation is complete, ready to load image data //initiation is complete, ready to load image data
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") console.log("init done")
>>>>>>> 14a4104f200c050a672892cadd01502c7e047d63
} }