From 77183422ca207c671d699aae8920704eae381a3b Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Sat, 8 Mar 2014 17:45:01 -0700 Subject: [PATCH] Fix Color methods not joining RGB values correctly. Apparently I broke it while refactoring? Huh. This should also fix importing themes from Oneechan? --- builds/appchan-x.user.js | 4 ++-- builds/crx/script.js | 4 ++-- src/Theming/color.coffee | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 098501c1b..788cf23a0 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -14608,7 +14608,7 @@ }; Color.prototype.rgb = function() { - return this.privateRGB().join(""); + return this.privateRGB().join(","); }; Color.prototype.hover = function() { @@ -14638,7 +14638,7 @@ color = _ref[_i]; rgb.push(minmax(color + shift)); } - return rgb.join(""); + return rgb.join(","); }; return Color; diff --git a/builds/crx/script.js b/builds/crx/script.js index 0cbc91816..8c5a551fc 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -14627,7 +14627,7 @@ }; Color.prototype.rgb = function() { - return this.privateRGB().join(""); + return this.privateRGB().join(","); }; Color.prototype.hover = function() { @@ -14657,7 +14657,7 @@ color = _ref[_i]; rgb.push(minmax(color + shift)); } - return rgb.join(""); + return rgb.join(","); }; return Color; diff --git a/src/Theming/color.coffee b/src/Theming/color.coffee index 0f6f00acf..27a705c8d 100644 --- a/src/Theming/color.coffee +++ b/src/Theming/color.coffee @@ -40,7 +40,7 @@ class Color @raw = colorToHex value hex: -> "#" + @raw - rgb: -> @privateRGB().join "" + rgb: -> @privateRGB().join "," hover: -> @shiftRGB 16, true isLight: -> @@ -60,4 +60,4 @@ class Color shift = (if @isLight() then -1 else 1) * Math.abs shift if smart rgb = [] rgb.push minmax color + shift for color in @privateRGB() - rgb.join "" \ No newline at end of file + rgb.join "," \ No newline at end of file