supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build clean text message only once

Browse Source
This commit is contained in:
Pavel Djundik 2018-04-19 19:01:20 +03:00
parent 162b801839
commit d19c00faab
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/js/libs/handlebars/ircmessageparser/merge.js
View File

@ -24,10 +24,7 @@ function sortParts(a, b) {
// different styles, the first resulting part will contain fragments "fo" and // different styles, the first resulting part will contain fragments "fo" and
// "o", and the second resulting part will contain "b" and "ar". "o" and "b" // "o", and the second resulting part will contain "b" and "ar". "o" and "b"
// fragments will contain duplicate styling attributes. // fragments will contain duplicate styling attributes.
function merge(textParts, styleFragments) { function merge(textParts, styleFragments, cleanText) {
// Re-build the overall text (without control codes) from the style fragments
const cleanText = styleFragments.reduce((acc, frag) => acc + frag.text, "");
// Every section of the original text that has not been captured in a "part" // Every section of the original text that has not been captured in a "part"
// is filled with "text" parts, dummy objects with start/end but no extra // is filled with "text" parts, dummy objects with start/end but no extra
// metadata. // metadata.

2
client/js/libs/handlebars/parse.js
View File

@ -91,7 +91,7 @@ module.exports = function parse(text, users) {
// Merge the styling information with the channels / URLs / nicks / text objects and // Merge the styling information with the channels / URLs / nicks / text objects and
// generate HTML strings with the resulting fragments // generate HTML strings with the resulting fragments
return merge(parts, styleFragments).map((textPart) => { return merge(parts, styleFragments, cleanText).map((textPart) => {
// Create HTML strings with styling information // Create HTML strings with styling information
const fragments = textPart.fragments.map(createFragment).join(""); const fragments = textPart.fragments.map(createFragment).join("");

2
test/client/js/libs/handlebars/ircmessageparser/merge.js
View File

@ -56,7 +56,7 @@ describe("merge", () => {
}], }],
}]; }];
const actual = merge(textParts, styleFragments); const actual = merge(textParts, styleFragments, styleFragments.map((fragment) => fragment.text).join(""));
expect(actual).to.deep.equal(expected); expect(actual).to.deep.equal(expected);
}); });