Changeset 312

Timestamp:

06/25/08 18:24:25 (8 weeks ago)

Author:

heyadayo

Message:

Fixed hex decoding for IE

Files:

• branches/0.5/daemon/orbited/static/hex.js (modified) (3 diffs)

branches/0.5/daemon/orbited/static/hex.js

@@ -1 @@
-hexChars = '0123456789ABCDEF'
-
-hexToBase10 = { }
-base10ToHex = { }
-for (var i = 0; i < hexChars.length; ++i) {
-    hexToBase10[hexChars[i]] = i
-    base10ToHex[i] = hexChars[i]
-}
-
 hexToBytes = function(str) {
+//  str = str.toUpperCase()
     if (str.length == 0)
         return []
@@ -15 +7 @@
     var output = []
     for (var i =0; i < str.length; i+=2) {
-        var val = (hexToBase10[str[i]] << 4) + (hexToBase10[str[i+1]])
-        output.push(val)
+        target = str.charAt(i) + str.charAt(i+1)
+        output.push(parseInt(target, 16))
     }
     return output
@@ -33 +25 @@
     return output.join("")
 }
-/*
-bytesToHex = function(bytes) {
-    var output = []
-    for (var i = 0; i < bytes.length; ++i) {
-        var byte = bytes[i]
-        var hex1 = byte >> 4
-        output.push(base10ToHex[hex1])
-        output.push(base10ToHex[byte - (hex1 << 4)])
-    }
-    return output.join("")
-}
-*/