deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-06 07:42:17 +02:00
Code Issues Projects Releases Wiki Activity

Fix up how span elements are generated in message parser

Browse source
This commit is contained in:
Pavel Djundik 2018-09-05 21:00:39 +03:00
parent ba2522ecda
commit 4f3dbc4b8f
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/js/libs/handlebars/parse.js
View file

@ -42,17 +42,26 @@ function createFragment(fragment, createElement) {
classes.push("irc-monospace");
}
if (classes.length === 0 && !fragment.hexColor) {
return fragment.text;
const data = {};
let hasData = false;
if (classes.length > 0) {
hasData = true;
data.class = classes;
}
return createElement("span", {
class: classes,
style: {
"color": `#${fragment.hexColor}`,
"background-color": fragment.hexBgColor ? `#${fragment.hexBgColor}` : null,
},
}, fragment.text);
if (fragment.hexColor) {
hasData = true;
data.style = {
color: `#${fragment.hexColor}`,
};
if (fragment.hexBgColor) {
data.style["background-color"] = `#${fragment.hexBgColor}`;
}
}
return hasData ? createElement("span", data, fragment.text) : fragment.text;
}
// Transform an IRC message potentially filled with styling control codes, URLs,