From 03662dc05603ae408d50395e3545c7d13f0e5cee Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 17 Dec 2018 21:38:09 -0700 Subject: [PATCH] Fix major durp in code with CNET codes --- core/color_codes.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core/color_codes.js b/core/color_codes.js index e07b805e..4119a8ce 100644 --- a/core/color_codes.js +++ b/core/color_codes.js @@ -245,20 +245,24 @@ function controlCodesToAnsi(s, client) { } result += s.substr(lastIndex, m.index - lastIndex) + v; - break; case '\x19' : case '\0x11' : // CNET "Y-Style" & "Q-Style" v = m[9] || m[11]; - if('n1' === v) { - result += '\n'; - } else if('f1' === v) { - result += ANSI.clearScreen(); + if(v) { + if('n1' === v) { + v = '\n'; + } else if('f1' === v) { + v = ANSI.clearScreen(); + } else { + v = ansiSgrFromCnetStyleColorCode(v); + } } else { - result += ansiSgrFromCnetStyleColorCode(v); + v = m[0]; } + result += s.substr(lastIndex, m.index - lastIndex) + v; break; }