From f9a87cc46ec1bc90bad1e25d1ade03c1dca5be3e Mon Sep 17 00:00:00 2001
From: Nicola <nicpal2000@gmail.com>
Date: Mon, 24 Oct 2022 13:06:41 +0200
Subject: [PATCH] Final refinements

---
 css/_colors-menu.scss |  5 +++--
 js/ColorModule.js     | 19 ++++---------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/css/_colors-menu.scss b/css/_colors-menu.scss
index 9f0f835..15c4abf 100644
--- a/css/_colors-menu.scss
+++ b/css/_colors-menu.scss
@@ -212,10 +212,11 @@
 }
 
 #colors-menu-settings {
-	width: 100%;
+	width: 98%;
 	padding: 0px 0px 0px 0px;
 	position:relative;
 	top:0px;
+	background: $basecolor;
 
 	button {
 		position:relative;
@@ -224,7 +225,7 @@
 		margin-left:0px;
 		padding: 2px;
 		height:30px;
-		width:45.7%;
+		width:49%;
 		color: $basetext;
 		background: $basecolor;
 		border:none;
diff --git a/js/ColorModule.js b/js/ColorModule.js
index efbf1cc..97fb109 100644
--- a/js/ColorModule.js
+++ b/js/ColorModule.js
@@ -15,7 +15,7 @@ const ColorModule = (() => {
     // Binding events to callbacks
     document.getElementById('jscolor-hex-input').addEventListener('change',colorChanged, false);
     document.getElementById('jscolor-hex-input').addEventListener('input', colorChanged, false);
-    document.getElementById('add-color-button').addEventListener('click', addColorButtonEvent, false);
+    document.getElementById('add-color-button').addEventListener('click', addColorButtonEvent);
 
     Events.on("wheel", "colors-menu", resizeSquares);
     Events.on("click", document.getElementById("cm-add"), addColorButtonEvent);
@@ -152,11 +152,6 @@ const ColorModule = (() => {
      * 
      */
     function addColorButtonEvent() {
-        if (EditorState.getCurrentMode() == "Advanced") {
-            Dialogue.showDialogue("palette-block");
-            return;
-        }
-
         //generate random color
         const newColor = new Color("hsv", Math.floor(Math.random()*360), Math.floor(Math.random()*100), Math.floor(Math.random()*100)).hex;
 
@@ -172,11 +167,6 @@ const ColorModule = (() => {
 
         //add history state
         new HistoryState().AddColor(addedColor.firstElementChild.jscolor.toString());
-
-        //show color picker
-        addedColor.firstElementChild.jscolor.show();
-        //hide edit button
-        addedColor.lastChild.classList.add('hidden');
     }
 
     /** Adds the colors that have been added through the advanced-mode color picker to the 
@@ -271,7 +261,8 @@ const ColorModule = (() => {
                 Dialogue.showDialogue("palette-block", false);
         });
 
-        colorsMenu.children[0].classList.add('selected');
+        if (!document.querySelector('#colors-menu li.selected'))
+            colorsMenu.children[0].classList.add('selected');
         return listItem;
     }
 
@@ -492,9 +483,7 @@ const ColorModule = (() => {
             }
         }
 
-        //create palette from colors array
-        createColorPalette(colorPaletteArray);
-
+        return colorPaletteArray;
     }
 
     function updateCurrentColor(color, refLayer) {