Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline: Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
This commit is contained in:
commit
2f1e719cbe
|
@ -27,11 +27,12 @@ $(document).ready(function() {
|
|||
}
|
||||
}
|
||||
|
||||
/* rgb2hex written by R0bb13 <robertorebollo@gmail.com> */
|
||||
function rgb2hex(rgb) {
|
||||
if (rgb.slice(0,1) == '#') { return rgb; }
|
||||
rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
|
||||
return '#' + dec2hex(rgb[1]) + dec2hex(rgb[2]) + dec2hex(rgb[3]);
|
||||
}
|
||||
/* dec2hex written by R0bb13 <robertorebollo@gmail.com> */
|
||||
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];
|
||||
|
|
Loading…
Reference in New Issue
Block a user