Changeset 313

Timestamp:

06/25/08 19:25:28 (8 weeks ago)

Author:

heyadayo

Message:

Fixed STOMP for IE

Location:

branches/0.5/daemon/orbited

Files:

• config.py (modified) (1 diff)
• static/BinaryTCPSocket.js (modified) (4 diffs)
• static/TCPSocket.js (modified) (1 diff)
• static/URL.js (modified) (1 diff)
• static/WebSocket.js (modified) (1 diff)
• static/demos/stomp/index.html (modified) (1 diff)
• static/orbited.js (modified) (1 diff)
• static/protocols/stomp/stomp.js (modified) (2 diffs)

branches/0.5/daemon/orbited/config.py

@@ -23 +23 @@
     '[access]': [
     ],
+    '[static]': {
+    
+    }
+    
 }
 

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

@@ -118 +118 @@
     }
     var encodeQs = function(o) {
-            output = ""
+            var output = ""
             for (key in o)
                 output += "&" + key + "=" + o[key]
@@ -693 +693 @@
 
 // start @include(hex.js)
-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 []
@@ -709 +701 @@
     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
@@ -727 +719 @@
     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("")
-}
-*/
 // end @include(hex.js)
 

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

@@ -118 +118 @@
     }
     var encodeQs = function(o) {
-            output = ""
+            var output = ""
             for (key in o)
                 output += "&" + key + "=" + o[key]

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

@@ -103 +103 @@
     }
     var encodeQs = function(o) {
-            output = ""
+            var output = ""
             for (key in o)
                 output += "&" + key + "=" + o[key]

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

@@ -118 +118 @@
     }
     var encodeQs = function(o) {
-            output = ""
+            var output = ""
             for (key in o)
                 output += "&" + key + "=" + o[key]

branches/0.5/daemon/orbited/static/demos/stomp/index.html

@@ -14 +14 @@
             var output = document.getElementById('output')
             var s = new Shell(output)
-            print = s.print
+            shellprint = s.print
 //            ORBITED_PORT = 8000
             stomp = new STOMPClient()
-            stomp.onmessage = function(msg) { print(msg.body) }
+            stomp.onmessage = function(msg) { shellprint (msg.body) }
             stomp.onerror = function(msg) { alert(msg.body) }
-            stomp.onopen = function() { print("Connected to ActiveMQ as user " + document.getElementById('username').value)}
+            stomp.onopen = function() { shellprint ("Connected to ActiveMQ as user " + document.getElementById('username').value) }
         }
     </script>

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

@@ -117 +117 @@
     }
     var encodeQs = function(o) {
-            output = ""
+            var output = ""
             for (key in o)
                 output += "&" + key + "=" + o[key]

branches/0.5/daemon/orbited/static/protocols/stomp/stomp.js

@@ -27 +27 @@
     var parse_buffer = function () {
         var msgs = self.buffer.split('\0\n')
-        self.buffer = msgs.splice(-1)[0]
-
-        for (i=0; i<msgs.length; i++)
+        self.buffer = msgs[msgs.length-1]
+        for (i=0; i<msgs.length-1; i++)
             dispatch(msgs[i])
     }
@@ -113 +112 @@
         buffer = ""                     // reset buffer state
         self.user = user
-        
         var onsockopen = function() {
             send_frame("CONNECT", [["login", user]])