Merge pull request #831 from Vaesper/nicklistcolors

Nick list colors now also work without background color
This commit is contained in:
Lorenz Hübschle-Schneider 2016-10-11 21:30:34 +02:00 committed by GitHub
commit f4669f37ee

View file

@ -401,13 +401,13 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
'coa-' + colorName 'coa-' + colorName
]; ];
} else { } else {
if (color.match(/^[a-zA-Z]+[:$]/)) { if (color.match(/^[a-zA-Z]+(:|$)/)) {
// WeeChat color name (foreground) // WeeChat color name (foreground)
var cwfcolor = color.match(/^[a-zA-Z]+/)[0]; var cwfcolor = color.match(/^[a-zA-Z]+/)[0];
colorClasses = [ colorClasses = [
'cwf-' + cwfcolor 'cwf-' + cwfcolor
]; ];
} else if (color.match(/^[0-9]+[:$]/)) { } else if (color.match(/^[0-9]+(:|$)/)) {
// extended color (foreground) // extended color (foreground)
var cefcolor = color.match(/^[0-9]+/)[0]; var cefcolor = color.match(/^[0-9]+/)[0];
colorClasses = [ colorClasses = [