Changeset 479

Timestamp:

08/11/08 04:31:25 (5 months ago)

Author:

heyadayo

Message:

the other half of the opera xsdr code (still doesn't work)

Location:

trunk/daemon/orbited

Files:

• static/Orbited.js (modified) (3 diffs)
• transports/__init__.py (modified) (1 diff)

trunk/daemon/orbited/static/Orbited.js

@@ -887 +887 @@
     
 }
+
+if (Orbited.util.browser == "opera")
+{
+    document.addEventListener('message', function(e) {
+        var msg = e.data.split(" ");
+        var cmd = msg.shift();
+        if (cmd == "event") 
+        {
+            var id = msg.shift();
+            var dataString = msg.join(" ");
+            var data = JSON.parse(dataString);
+    
+            Orbited.singleton.XSDR.receiveCbs[id](data)
+        }
+        if (cmd == "queues")
+        {
+            var id = msg.shift();
+            var queue = XSubdomainRequest.prototype._state.queues[id];
+            if (queue.length > 0) {
+                var data = queue.shift();
+                e.source.postMessage(JSON.stringify(data), e.origin);
+            }
+        }
+    }, false
+    );
+}
+
 Orbited.XSDR.prototype.logger = Orbited.getLogger("Orbited.XSDR");
 Orbited.singleton.XSDRBridgeLogger = Orbited.getLogger('XSDRBridge');
@@ -953 +980 @@
             xhr.open('GET', url.render(), true)
             xhr.onreadystatechange = function() {
+;;;             self.logger.debug(xhr.readyState);
                 if (self.readyState == 2) { 
                     return
                 }
-;;;             self.logger.debug(xhr.readyState);
                 switch(xhr.readyState) {
                     case 2:
@@ -1484 +1511 @@
 }
 
-
-
 })();
+
+

trunk/daemon/orbited/transports/__init__.py

@@ -2 +2 @@
 import htmlfile
 import sse
+import longpoll
+
 map = {
     'xhrstream': xhrstream.XHRStreamingTransport,
     'htmlfile': htmlfile.HTMLFileTransport,
-    'sse': sse.SSETransport
+    'sse': sse.SSETransport,
+    'longpoll': longpoll.LongPollingTransport
 }
+
 def create(transport_name, conn):
 #    transport_name = request.args.get('transport', ['xhrstream'])[0]