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

Merge pull request #609 from xPaw/ignore-bad-colors

Browse Source 
Simply parse all 0-99 irc colors
This commit is contained in:
Mattias Erming 2016-01-24 16:03:23 +01:00
commit 6f33b79c0a
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/js/libs.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -56,8 +56,8 @@ function uri(text) {
* https://github.com/megawac/irc-style-parser/tree/shout * https://github.com/megawac/irc-style-parser/tree/shout
*/ */
var styleCheck_Re = /[\x00-\x1F]/, var styleCheck_Re = /[\x00-\x1F]/,
back_re = /^(\d{1,2})(,(\d{1,2}))?/, back_re = /^([0-9]{1,2})(,([0-9]{1,2}))?/,
colourKey = "\x03", colour_re = /\x03/g, colourKey = "\x03",
// breaks all open styles ^O (\x0F) // breaks all open styles ^O (\x0F)
styleBreak = "\x0F"; styleBreak = "\x0F";
@ -79,15 +79,6 @@ var styles = [
}; };
}); });
//http://www.mirc.com/colors.html
var colourMap = {};
for (var colour = 0; colour < 16; colour++) {
colourMap[colour] = {
fore: "irc-fg" + colour,
back: "irc-bg" + colour
};
}
function colors(line) { function colors(line) {
// http://www.mirc.com/colors.html // http://www.mirc.com/colors.html
// http://www.aviran.org/stripremove-irc-client-control-characters/ // http://www.aviran.org/stripremove-irc-client-control-characters/
@ -108,20 +99,19 @@ function colors(line) {
for (var i = 0; i < parseArr.length; i++) { for (var i = 0; i < parseArr.length; i++) {
text = parseArr[i]; text = parseArr[i];
match = text.match(back_re); match = text.match(back_re);
colour = match && colourMap[+match[1]]; if (!match) {
if (!match || !colour) {
// ^C (no colour) ending. Escape current colour and carry on // ^C (no colour) ending. Escape current colour and carry on
background = ""; background = "";
continue; continue;
} }
// set the background colour colour = "irc-fg" + +match[1];
// we don't overide the background local var to support nesting // set the background colour
if (colourMap[+match[3]]) { if (match[3]) {
background = " " + colourMap[+match[3]].back; background = " irc-bg" + +match[3];
} }
// update the parsed text result // update the parsed text result
result = result.replace(colourKey + text, styleTemplate({ result = result.replace(colourKey + text, styleTemplate({
style: colour.fore + background, style: colour + background,
text: text.slice(match[0].length) text: text.slice(match[0].length)
})); }));
} }
@ -138,6 +128,5 @@ function colors(line) {
}); });
}); });
//replace the reminent colour terminations and be done with it return result;
return result.replace(colour_re, "");
} }