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

Move part sorting to merge

Browse source
This commit is contained in:
Pavel Djundik 2018-04-19 19:00:46 +03:00
parent 886301e765
commit 162b801839
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/js/libs/handlebars/ircmessageparser/merge.js
View file

@ -13,7 +13,11 @@ function assign(textPart, fragment) {
return Object.assign({}, fragment, {start, end, text});
}
// Merge the style fragments withing the text parts, taking into account
function sortParts(a, b) {
return a.start - b.start || b.end - a.end;
}
// Merge the style fragments within the text parts, taking into account
// boundaries and text sections that have not matched to links or channels.
// For example, given a string "foobar" where "foo" and "bar" have been
// identified as parts (channels, links, etc.) and "fo", "ob" and "ar" have 3
@ -28,8 +32,18 @@ function merge(textParts, styleFragments) {
// is filled with "text" parts, dummy objects with start/end but no extra
// metadata.
const allParts = textParts
.sort(sortParts) // Sort all parts identified based on their position in the original text
.concat(fill(textParts, cleanText))
.sort((a, b) => a.start - b.start);
.sort(sortParts) // Sort them again after filling in unstyled text
.reduce((prev, curr) => {
const intersection = prev.some((p) => anyIntersection(p, curr));
if (intersection) {
return prev;
}
return prev.concat([curr]);
}, []);
// Distribute the style fragments within the text parts
return allParts.map((textPart) => {

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

@ -2,7 +2,6 @@
const Handlebars = require("handlebars/runtime");
const parseStyle = require("./ircmessageparser/parseStyle");
const anyIntersection = require("./ircmessageparser/anyIntersection");
const findChannels = require("./ircmessageparser/findChannels");
const findLinks = require("./ircmessageparser/findLinks");
const findEmoji = require("./ircmessageparser/findEmoji");
@ -85,21 +84,10 @@ module.exports = function parse(text, users) {
const emojiParts = findEmoji(cleanText);
const nameParts = findNames(cleanText, (users || []));
// Sort all parts identified based on their position in the original text
const parts = channelParts
.concat(linkParts)
.concat(emojiParts)
.concat(nameParts)
.sort((a, b) => a.start - b.start || b.end - a.end)
.reduce((prev, curr) => {
const intersection = prev.some((p) => anyIntersection(p, curr));
if (intersection) {
return prev;
}
return prev.concat([curr]);
}, []);
.concat(nameParts);
// Merge the styling information with the channels / URLs / nicks / text objects and
// generate HTML strings with the resulting fragments