From c6bab2b61963b11537ff470a3f82bcb40c3c7e81 Mon Sep 17 00:00:00 2001
From: Frank Naegler <frank.naegler@typo3.org>
Date: Thu, 23 Nov 2017 17:04:16 +0100
Subject: [PATCH] [BUGFIX] Colorpicker in irre records
This patch checks if a value is set before writing
a possbile empty value to the field.
Resolves: #83000
Releases: master, 8.7
Change-Id: I3badd9b9ff1a567351d971b5ae0199bf347e0f72
Reviewed-on: https://review.typo3.org/54731
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Jan Helke <typo3@helke.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
.../Resources/Private/TypeScript/ColorPicker.ts | 15 +++++++++------
.../Resources/Public/JavaScript/ColorPicker.js | 15 +++++++++------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/TypeScript/ColorPicker.ts b/typo3/sysext/backend/Resources/Private/TypeScript/ColorPicker.ts
index afc9d2d39124..b5370c75cd40 100644
--- a/typo3/sysext/backend/Resources/Private/TypeScript/ColorPicker.ts
+++ b/typo3/sysext/backend/Resources/Private/TypeScript/ColorPicker.ts
@@ -41,12 +41,15 @@ class ColorPicker {
position: 'bottom left',
theme: 'bootstrap',
});
- $(document).on('change', '.t3js-colorpicker-value-trigger', function(this: HTMLFormElement): void {
- $(this).closest('.t3js-formengine-field-item')
- .find('.t3js-color-picker')
- .val(this.value)
- .trigger('paste');
- $(this).val('');
+ $(document).on('change', '.t3js-colorpicker-value-trigger', (event: Event): void => {
+ const $element = $(event.target);
+ if ($element.val() !== '') {
+ $element.closest('.t3js-formengine-field-item')
+ .find('.t3js-color-picker')
+ .val($element.val())
+ .trigger('paste');
+ $element.val('');
+ }
});
}
}
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/ColorPicker.js b/typo3/sysext/backend/Resources/Public/JavaScript/ColorPicker.js
index d676d051813f..6f027e83fe1b 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/ColorPicker.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/ColorPicker.js
@@ -33,12 +33,15 @@ define(["require", "exports", "jquery", "TYPO3/CMS/Core/Contrib/jquery.minicolor
position: 'bottom left',
theme: 'bootstrap',
});
- $(document).on('change', '.t3js-colorpicker-value-trigger', function () {
- $(this).closest('.t3js-formengine-field-item')
- .find('.t3js-color-picker')
- .val(this.value)
- .trigger('paste');
- $(this).val('');
+ $(document).on('change', '.t3js-colorpicker-value-trigger', function (event) {
+ var $element = $(event.target);
+ if ($element.val() !== '') {
+ $element.closest('.t3js-formengine-field-item')
+ .find('.t3js-color-picker')
+ .val($element.val())
+ .trigger('paste');
+ $element.val('');
+ }
});
};
return ColorPicker;
--
GitLab