lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix restore color if we cancel color selection

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-02 16:34:46 +01:00
parent adec35d4b1
commit 3d8de7790c
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/core/class/html.formother.class.php
View File

@ -844,6 +844,7 @@ class FormOther
$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>'; $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
$out .= '<script type="text/javascript"> $out .= '<script type="text/javascript">
jQuery(document).ready(function(){ jQuery(document).ready(function(){
var originalhex = null;
$(\'#colorpicker'.$prefix.'\').jPicker( { $(\'#colorpicker'.$prefix.'\').jPicker( {
window: { window: {
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */ title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
@ -873,18 +874,33 @@ class FormOther
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
newColor: \''.dol_escape_js($langs->trans("New")).'\', newColor: \''.dol_escape_js($langs->trans("New")).'\',
currentColor: \''.dol_escape_js($langs->trans("Current")).'\', currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
ok: \''.dol_escape_js($langs->trans("Save")).'\', ok: \''.dol_escape_js($langs->trans("Validate")).'\',
cancel: \''.dol_escape_js($langs->trans("Cancel")).'\' cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
} }
} }
}, },
function(color, context) { console.log("close"); }, function(color, context) { console.log("close color selector"); },
function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex+" setpropertyonselect='.dol_escape_js($setpropertyonselect).'");'; function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex+" setpropertyonselect='.dol_escape_js($setpropertyonselect).'");';
if ($setpropertyonselect) { if ($setpropertyonselect) {
$out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', \'#\'+hex);'; $out .= 'if (originalhex == null) {';
$out .= ' originalhex = getComputedStyle(document.querySelector(":root")).getPropertyValue(\'--'.dol_escape_js($setpropertyonselect).'\');';
$out .= ' console.log("original color is saved into originalhex = "+originalhex);';
$out .= '}';
$out .= 'if (hex != null) {';
$out .= ' document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', \'#\'+hex);';
$out .= '}';
} }
$out .= '}, $out .= '},
function(color, context) { console.log("cancel"); } function(color, context) {
console.log("cancel selection of color");';
if ($setpropertyonselect) {
$out .= 'if (originalhex != null) {
console.log("Restore old color "+originalhex);
document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', originalhex);
}';
}
$out .= '
}
); );
}); });
</script>'; </script>';
@ -922,11 +938,11 @@ class FormOther
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Creation d'un icone de couleur * Creae an image for color
* *
* @param string $color Couleur de l'image * @param string $color Color of image
* @param string $module Nom du module * @param string $module Name of module
* @param string $name Nom de l'image * @param string $name Name of image
* @param int $x Largeur de l'image en pixels * @param int $x Largeur de l'image en pixels
* @param int $y Hauteur de l'image en pixels * @param int $y Hauteur de l'image en pixels
* @return void * @return void