Changeset 302

Timestamp:

06/23/08 04:30:38 (2 months ago)

Author:

frank

Message:

bugfix for leading underscore in xsubdomairequest

Location:

branches/0.5/daemon/orbited/static

Files:

• BinaryTCPConnection.js (modified) (1 diff)
• OrbitedLegacyWrapper.js (modified) (2 diffs)
• TCPConnection.js (modified) (1 diff)
• WebSocket.js (modified) (1 diff)
• XSubdomainRequest.js (modified) (1 diff)
• orbited.js (modified) (3 diffs)

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

@@ -553 +553 @@
         throw new Error("Invalid bridge domain")
     if (!Boolean(bridgePath))
-        bridgePath = "/_/static/XSubdomainBridge.html"
+        bridgePath = "/static/XSubdomainBridge.html"
     if (!Boolean(markedHeaders))
         markedHeaders = [

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

@@ -1 +1 @@
 Orbited = {
-    connect: function (event_cb, token) {
+    connect: function (event_cb /* args 1-3 are token parts */) {
+        var tokens = Array.prototype.slice.call(arguments, 1)
+        var token = tokens.join(', ')
+        console.log(token)
+    
         var conn = new BaseTCPConnection()
         var connUrl = new URL(location.href)
@@ -14 +18 @@
         }
         conn.connect(connUrl.render())
-    }
+    },
+
+    create_xhr: function () {
+        try { return new ActiveXObject('MSXML3.XMLHTTP'); } catch(e) {}
+        try { return new ActiveXObject('MSXML2.XMLHTTP.3.0'); } catch(e) {}
+        try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
+        try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}
+        try { return new XMLHttpRequest(); } catch(e) {}
+        throw new Error('Could not find XMLHttpRequest or an alternative.');
+  }
+
+    
 }

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

@@ -553 +553 @@
         throw new Error("Invalid bridge domain")
     if (!Boolean(bridgePath))
-        bridgePath = "/_/static/XSubdomainBridge.html"
+        bridgePath = "/static/XSubdomainBridge.html"
     if (!Boolean(markedHeaders))
         markedHeaders = [

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

@@ -553 +553 @@
         throw new Error("Invalid bridge domain")
     if (!Boolean(bridgePath))
-        bridgePath = "/_/static/XSubdomainBridge.html"
+        bridgePath = "/static/XSubdomainBridge.html"
     if (!Boolean(markedHeaders))
         markedHeaders = [

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

@@ -4 +4 @@
         throw new Error("Invalid bridge domain")
     if (!Boolean(bridgePath))
-        bridgePath = "/_/static/XSubdomainBridge.html"
+        bridgePath = "/static/XSubdomainBridge.html"
     if (!Boolean(markedHeaders))
         markedHeaders = [

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

@@ -552 +552 @@
         throw new Error("Invalid bridge domain")
     if (!Boolean(bridgePath))
-        bridgePath = "/_/static/XSubdomainBridge.html"
+        bridgePath = "/static/XSubdomainBridge.html"
     if (!Boolean(markedHeaders))
         markedHeaders = [
@@ -693 +693 @@
 // start @include(OrbitedLegacyWrapper.js)
 Orbited = {
-    connect: function (event_cb, token) {
+    connect: function (event_cb /* args 1-3 are token parts */) {
+        var tokens = Array.prototype.slice.call(arguments, 1)
+        var token = tokens.join(', ')
+        console.log(token)
+    
         var conn = new BaseTCPConnection()
         var connUrl = new URL(location.href)
@@ -707 +711 @@
         }
         conn.connect(connUrl.render())
-    }
+    },
+
+    create_xhr: function () {
+        try { return new ActiveXObject('MSXML3.XMLHTTP'); } catch(e) {}
+        try { return new ActiveXObject('MSXML2.XMLHTTP.3.0'); } catch(e) {}
+        try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
+        try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}
+        try { return new XMLHttpRequest(); } catch(e) {}
+        throw new Error('Could not find XMLHttpRequest or an alternative.');
+  }
+
+    
 }