Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development

[KiwiIRC.git] / client / src / views / channel.js

diff --git a/client/src/views/channel.js b/client/src/views/channel.js
index 4275358928c46100f98a5ba25dc8d9ce5952b81d..8a5573268211b695cfe3b9b5e71d54f574e91cc4 100644 (file)
--- a/client/src/views/channel.js
+++ b/client/src/views/channel.js
@@ -244,11 +244,22 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
 
     // Sgnerate a css style for a nick
     getNickStyles: function(nick) {
-        var ret, colour, nick_int = 0, rgb;
+        var ret, colour, nick_int = 0, rgb, nick_lightness;
 
         // Get a colour from a nick (Method based on IRSSIs nickcolor.pl)
         _.map(nick.split(''), function (i) { nick_int += i.charCodeAt(0); });
-        rgb = hsl2rgb(nick_int % 255, 70, 35);
+
+        nick_lightness = (_.find(_kiwi.app.themes, function (theme) {
+            return theme.name.toLowerCase() === _kiwi.global.settings.get('theme').toLowerCase();
+        }) || {}).nick_lightness;
+
+        if (typeof nick_lightness !== 'number') {
+            nick_lightness = 35;
+        } else {
+            nick_lightness = Math.max(0, Math.min(100, nick_lightness));
+        }
+
+        rgb = hsl2rgb(nick_int % 255, 70, nick_lightness);
         rgb = rgb[2] | (rgb[1] << 8) | (rgb[0] << 16);
         colour = '#' + rgb.toString(16);