]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
authorSarven Capadisli <csarven@controlyourself.ca>
Tue, 25 Aug 2009 22:47:54 +0000 (22:47 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Tue, 25 Aug 2009 22:47:54 +0000 (22:47 +0000)
to IE and RGB to Firefox, Opera, Safari. Fun.

js/userdesign.go.js

index c53569beab859025860b07194dedeb6195f764b7..8ddb9ec38c7a7398f8ebdf3d8b0950f7bed7bb9f 100644 (file)
@@ -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];