Merge pull request #831 from Vaesper/nicklistcolors

Nick list colors now also work without background color
9 years ago · f4669f37ee
parent c46979088a 216da6fdab
commit f4669f37ee
1 changed files with 2 additions and 2 deletions
--- a/js/models.js
+++ b/js/models.js
@ -401,13 +401,13 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
                    'coa-' + colorName
                ];
            } else {
-                if (color.match(/^[a-zA-Z]+[:$]/)) {
+                if (color.match(/^[a-zA-Z]+(:|$)/)) {
                    // WeeChat color name (foreground)
                    var cwfcolor = color.match(/^[a-zA-Z]+/)[0];
                    colorClasses = [
                        'cwf-' + cwfcolor
                    ];
-                } else if (color.match(/^[0-9]+[:$]/)) {
+                } else if (color.match(/^[0-9]+(:|$)/)) {
                    // extended color (foreground)
                    var cefcolor = color.match(/^[0-9]+/)[0];
                    colorClasses = [