Skip to content

Commit 71705a9

Browse files
committed
update 4 pres
1 parent 4eb873d commit 71705a9

4 files changed

Lines changed: 22 additions & 2 deletions

File tree

assets/js/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ let currImg;
22
let tsaveim
33
let viewDim = []
44
let sampleData = []
5-
const totalExamples = 52
5+
const totalExamples = 28
66
let categories = {
77
default: {
88
name: "default",
@@ -75,7 +75,7 @@ function loadExamples(week = 0, author = "giorgia") {
7575
el.onclick = loadEx
7676
container.appendChild(el);
7777
}*/
78-
for (let i = 1; i < totalExamples; i++) {
78+
for (let i = 25; i < totalExamples; i++) {
7979
let num = i
8080

8181
if (num < 10) {

assets/js/newCollage.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,20 @@ function hidePalette() {
256256
container.style.display = "none"
257257
}
258258

259+
260+
function delPalette() {
261+
console.log(selectedPalette)
262+
delete megaPalettes[selectedPalette]
263+
delete megaGlyph[selectedPalette]
264+
delete dataBinding[selectedPalette]
265+
d3.select("#collage-"+selectedPalette).remove()
266+
drawSvg()
267+
hidePalette()
268+
}
269+
259270
function displayPalette(name) {
260271

272+
selectedPalette = name
261273

262274
let trange = document.getElementById("strokewidth")
263275

assets/js/paletteHandler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,8 @@ function savePalette() {
829829
document.getElementById("paletteContainer").style.display = "none";
830830

831831
// fillPalette()
832+
833+
drawSvg()
832834
}
833835

834836

index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,16 @@ <h3 style="display: inline;font-weight:700;margin-left:10px;color: #eeeeee">Desc
9292
</div>
9393
<div style="width: calc(100% - 350px);border-radius: 14px">
9494
<div style="display: none" id="paletteDetails">
95+
<div style="position: absolute;width: 25px;height: 25px;right: 40px;top: 10px;cursor: pointer">
96+
<img style="width: inherit;filter: invert(1)" onclick="delPalette()"
97+
src="assets/images/buttons/del.png">
98+
</div>
9599
<div style="position: absolute;width: 25px;height: 25px;right: 10px;top: 10px;cursor: pointer">
96100
<img style="width: inherit;filter: invert(1)" onclick="hidePalette()"
97101
src="assets/images/buttons/cross.png">
98102
</div>
103+
104+
99105
<div id="paletteTitle" style="width: 100%; display: flex">
100106
</div>
101107
<div></div>

0 commit comments

Comments
 (0)