From ef0574c8a7589fd14a2d8863a2a78982f7e80cd3 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Fri, 16 Apr 2021 21:19:16 -0500 Subject: [PATCH] Update addons --- src/addons/addons/2d-color-picker/paint-editor.js | 7 ++----- src/addons/libraries/normalize-color.js | 2 +- src/addons/upstream-meta.json | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/addons/addons/2d-color-picker/paint-editor.js b/src/addons/addons/2d-color-picker/paint-editor.js index 867610f91..f7ea6a715 100644 --- a/src/addons/addons/2d-color-picker/paint-editor.js +++ b/src/addons/addons/2d-color-picker/paint-editor.js @@ -248,11 +248,8 @@ export default async ({ addon, console, msg }) => { addon.tab.redux.addEventListener("statechanged", prevEventHandler); saColorPicker.appendChild(saColorPickerImage); saColorPicker.appendChild(saColorPickerHandle); - let e = element; - if (element.parentElement.querySelector(".sa-color-picker")) - e = element.parentElement.querySelector(".sa-color-picker"); - element.parentElement.insertBefore(saColorLabel, e); - element.parentElement.insertBefore(saColorPicker, e); + element.parentElement.insertBefore(saColorPicker, element.parentElement.children[4]); + element.parentElement.insertBefore(saColorLabel, element.parentElement.children[4]); //hide sat and bright sliders saColorPicker.parentElement.children[2].style.display = "none"; diff --git a/src/addons/libraries/normalize-color.js b/src/addons/libraries/normalize-color.js index 11fd81740..ea3ddea9d 100644 --- a/src/addons/libraries/normalize-color.js +++ b/src/addons/libraries/normalize-color.js @@ -1,4 +1,4 @@ -export const getHexRegex = () => /^#[0-9a-fA-F]{3,8}$/; +export const getHexRegex = () => /^#?[0-9a-fA-F]{3,8}$/; export const normalizeHex = (input) => { let hex = String(input); diff --git a/src/addons/upstream-meta.json b/src/addons/upstream-meta.json index a5e2e2b60..d9c26c6d8 100644 --- a/src/addons/upstream-meta.json +++ b/src/addons/upstream-meta.json @@ -1 +1 @@ -{"version":"1.12.1","commit":"0faef25","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]} \ No newline at end of file +{"version":"1.12.1","commit":"9c14192","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]} \ No newline at end of file