From f9ca3a67bac6011271e6709c70ba3e56f14a4242 Mon Sep 17 00:00:00 2001
From: Giovanni Caruso <gc4117@cloud-vm-36-76.doc.ic.ac.uk>
Date: Tue, 29 Oct 2019 17:34:38 +0000
Subject: [PATCH] Fixed palette not updating label
---
src/app.js | 17 ++++++++++++++++-
src/elements.js | 2 ++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/app.js b/src/app.js
index d2adc8b..a420201 100644
--- a/src/app.js
+++ b/src/app.js
@@ -107,7 +107,7 @@ for (let i = 1; i < svg.length; i++) {
const paletteColour = event.target.getAttribute("fill")
HTML.rectangle.style.backgroundColor = paletteColour
HTML.picker.value = paletteColour
- HTML.labelColour.style.backgroundColor = paletteColour
+ HTML.labelColours.style.backgroundColor = paletteColour
canvas.setStrokeColour(paletteColour)
hideElement(HTML.palette)
})
@@ -147,6 +147,21 @@ x.addListener(() => {
}
})
+function showElement(element) {
+ element.style.display = "block"
+}
+
+function hideElement(element) {
+ element.style.display = "none"
+}
+
+HTML.picker.addEventListener("change", () => {
+ var paletteColour = event.target.value
+ HTML.rectangle.style.backgroundColor = paletteColour
+ HTML.labelColours.style.backgroundColor = paletteColour
+ canvas.setStrokeColour(paletteColour)
+})
+
HTML.eraserButton.addEventListener("click", () => {
currentTool = tools.ERASER
HTML.penButton.classList.remove("selected")
diff --git a/src/elements.js b/src/elements.js
index cd426f8..1b63ba8 100644
--- a/src/elements.js
+++ b/src/elements.js
@@ -29,3 +29,5 @@ export const picker = document.getElementById("other-colours")
export const labelColour = document.getElementById("colours")
export const slider = document.getElementById("range")
export const output = document.getElementById("value")
+export const picker = document.getElementById("other-colours")
+export const labelColours = document.getElementById("colours")
--
GitLab