summaryrefslogtreecommitdiff
path: root/js/userdesign.go.js
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:27:43 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:27:43 -0400
commit9f356b55c6f419468771c0f3c2450010c0242abe (patch)
tree4cd175c7ef96380b5be82722581d63cf2f2fcb30 /js/userdesign.go.js
parent5dc1291b59a1079cbe9bab05d12dae06b8e4c96d (diff)
parenta645d0468b368c7c659b440f72ec80498055ac3e (diff)
Merge branch '0.9.x' into openidplugin
Conflicts: actions/login.php actions/register.php
Diffstat (limited to 'js/userdesign.go.js')
-rw-r--r--js/userdesign.go.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index 70dd9c7de..c53569bea 100644
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -27,13 +27,14 @@ $(document).ready(function() {
}
}
+ /* rgb2hex written by R0bb13 <robertorebollo@gmail.com> */
function rgb2hex(rgb) {
rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
- function hex(x) {
- hexDigits = new Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F");
- return isNaN(x) ? "00" : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
- }
- return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
+ return '#' + dec2hex(rgb[1]) + dec2hex(rgb[2]) + dec2hex(rgb[3]);
+ }
+ function dec2hex(x) {
+ hexDigits = new Array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+ return isNaN(x) ? '00' : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
}
function UpdateColors(S) {