Changeset 14960 for dojox/trunk/cometd

Timestamp:

08/26/08 16:44:46 (3 months ago)

Author:

kzyp

Message:

Saves are now specific to JsonRestStores? by default. RestChannels? should now work in multiple tabs.

Files:

• dojox/trunk/cometd/RestChannels.js (modified) (7 diffs)

dojox/trunk/cometd/RestChannels.js

@@ -79 +79 @@
                 subscriptions: {},
                 subCallbacks: {},
-                autoReconnectTime: 30000,
+                autoReconnectTime: 3000,
                 sendAsJson: false,
                 url: '/channels',
@@ -94 +94 @@
                                 this.connectionId = dojox._clientId;
                                 var clientIdHeader = this.started ? 'X-Client-Id' : 'X-Create-Client-Id';
-
+                                console.log("opening connection");
                                 var headers = {Accept:this.acceptType};
                                 headers[clientIdHeader] = this.connectionId;
@@ -101 +101 @@
                                 this.lastIndex = 0; 
                                 var onerror, onprogress = function(data){ // get all the possible event handlers
+                                        console.log("xhr.status", xhr.status);
                                         if(typeof dojo == 'undefined'){
                                                 return null;// this can be called after dojo is unloaded, just do nothing in that case
@@ -109 +110 @@
                                         var error = self.onprogress(xhr,data,contentType);
                                         if(error){
-                                                onerror();
-                                                return new Error(error);
+                                                if(onerror()){
+                                                        return new Error(error);
+                                                }
                                         }
                                         if(!xhr || xhr.readyState==4){
@@ -122 +124 @@
                                 };
                                 onerror = function(error){
+                                        if(xhr && xhr.status == 409){
+                                                // a 409 indicates that there is a multiple connections, and we need to poll
+                                                console.log("multiple tabs/windows open, polling");
+                                                self.disconnected();
+                                                return null;
+                                        }
                                         if(self.started){ // this means we need to reconnect
                                                 self.started = false;
@@ -309 +317 @@
                         }
                         try{
-                                message.data = message.content || dojo.fromJson(message.responseText);
+                                message.data = message.data || dojo.fromJson(message.responseText);
                         }
                         catch(e){}
@@ -339 +347 @@
                                 }
                         }
-                        else if(dojox.io.httpParse && contentType.match(/application\/http/)){
+                        else if(dojox.io && dojox.io.httpParse && contentType.match(/application\/http/)){
                                 // do HTTP tunnel parsing
                                 var topHeaders = '';