mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-01-27 09:24:45 +00:00
Code Issues Releases Wiki Activity

Fix editing colours that are not in 6 digit hex format

Browse Source 
See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/color#value
This commit is contained in:
Jeremy Ruston 2025-01-08 09:59:04 +00:00
parent 5d1cf251b9
commit 6b39d6aa43
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/editor/engines/simple.js
View File

@ -31,7 +31,12 @@ function SimpleEngine(options) {
if(this.widget.editTag === "textarea") { if(this.widget.editTag === "textarea") {
this.domNode.appendChild(this.widget.document.createTextNode(this.value)); this.domNode.appendChild(this.widget.document.createTextNode(this.value));
} else { } else {
this.domNode.value = this.value; if(this.widget.editType === "color") {
// The <input type="color"> element requires a six digit hex value
this.domNode.value = $tw.utils.convertColorToCSSRGBString(this.value);
} else {
this.domNode.value = this.value;
}
} }
// Set the attributes // Set the attributes
if(this.widget.editType && this.widget.editTag !== "textarea") { if(this.widget.editType && this.widget.editTag !== "textarea") {

16
core/modules/utils/dom/color-utils.js
View File

@ -41,4 +41,20 @@ exports.parseCSSColorObject = function(colourString) {
return c; return c;
}; };
/*
Convert a Color.js colour to a CSS RGB string suitable for use with the <input type="color"> element
*/
exports.convertColorToCSSRGBString = function(colourString) {
var c = exports.parseCSSColorObject(colourString);
if(c) {
var hex = c.toString({format: "hex"});
if(hex.length === 4) {
hex = "#" + hex[1] + hex[1] + hex[2] + hex[2] + hex[3] + hex[3];
}
return hex;
} else {
return null;
}
};
})(); })();