Changeset 13143

Timestamp:

03/19/08 05:24:10 (8 months ago)

Author:

alex

Message:

Adds a subscribe/unsubscribe handle system (still needs docs). Formatting updates. Refs #4366

Files:

• dojox/trunk/cometd/_base.js (modified) (5 diffs)

dojox/trunk/cometd/_base.js

@@ -19 +19 @@
         
         // cometd states:
-        this.DISCONNECTED="DISCONNECTED";       // _initialized==false  && _connected==false
-        this.CONNECTING="CONNECTING";           // _initialized==true   && _connected==false (handshake sent)
-        this.CONNECTED="CONNECTED";             // _initialized==true   && _connected==true (first successful connect)
-        this.DISCONNECTING="DISCONNECING";      // _initialized==false  && _connected==true (disconnect sent)
+
+        // alex; OMG, these "constants" need to die. Java truly is a degenerative disease.
+        this.DISCONNECTED = "DISCONNECTED";             // _initialized==false  && _connected==false
+        this.CONNECTING = "CONNECTING";                 // _initialized==true   && _connected==false (handshake sent)
+        this.CONNECTED = "CONNECTED";                   // _initialized==true   && _connected==true (first successful connect)
+        this.DISCONNECTING = "DISCONNECING";    // _initialized==false  && _connected==true (disconnect sent)
         
         this._initialized = false;
@@ -30 +32 @@
         this.connectionTypes = new dojo.AdapterRegistry(true);
 
-        this.version="1.0";
-        this.minimumVersion="0.9";
-        this.clientId=null;
-        this.messageId=0;
-        this.batch=0;
+        this.version =  "1.0";
+        this.minimumVersion = "0.9";
+        this.clientId = null;
+        this.messageId = 0;
+        this.batch = 0;
 
         this._isXD = false;
-        this.handshakeReturn=null;
-        this.currentTransport=null;
+        this.handshakeReturn = null;
+        this.currentTransport = null;
         this.url = null;
-        this.lastMessage=null;
-        this._messageQ=[];
-        this.handleAs="json-comment-optional";
-        this._advice={};
-        this._backoffInterval=0;
-        this._backoffIncrement=1000;
-        this._backoffMax=60000;
-        this._deferredSubscribes={};
-        this._deferredUnsubscribes={};
-        this._subscriptions=[];
-        this._extendInList=[];  // List of functions invoked before delivering messages
-        this._extendOutList=[]; // List of functions invoked before sending messages
+        this.lastMessage = null;
+        this._messageQ = [];
+        this.handleAs = "json-comment-optional";
+        this._advice = {};
+        this._backoffInterval = 0;
+        this._backoffIncrement = 1000;
+        this._backoffMax = 60000;
+        this._deferredSubscribes = {};
+        this._deferredUnsubscribes = {};
+        this._subscriptions = [];
+        this._extendInList = [];        // List of functions invoked before delivering messages
+        this._extendOutList = [];       // List of functions invoked before sending messages
 
         this.state = function() {
-                return this._initialized?(this._connected?this.CONNECTED:this.CONNECTING):(this._connected?this.DISCONNECTING:this.DISCONNECTED);
+                return this._initialized ? 
+                        (this._connected ? "CONNECTED" : "CONNECTING") : 
+                        ( this._connected ? "DISCONNECTING" : "DISCONNECTED");
         }
 
@@ -168 +172 @@
                         r = dojo.xhrPost(bindArgs);
                 }
-                dojo.publish("/cometd/meta", [{cometd:this,action:"handshake",successful:true,state:this.state()}]);
+                dojo.publish("/cometd/meta", [
+                        {
+                                cometd: this,
+                                action: "handshake",
+                                successful: true,
+                                state: this.state()
+                        }
+                ]);
                 return r;
         }
@@ -241 +252 @@
                                 funcName: funcName
                         });
-                        this._subscriptions[tname] =subs;
-                }
-                return this._deferredSubscribes[channel];
+                        this._subscriptions[tname] = subs;
+                }
+                var ret = this._deferredSubscribes[channel]||{};
+                ret.args = dojo._toArray(arguments);
+                return ret;
         }
 
@@ -263 +276 @@
                 //              the second half of the objOrFunc/funcName pair for identifying
                 //              a callback function to notifiy upon channel message delivery
+
+                if(
+                        (arguments.length == 1) &&
+                        (!dojo.isString(channel)) &&
+                        (channel.args)
+                ){
+                        // it's a subscription handle, unroll
+                        return this.unsubscribe.apply(this, channel.args);
+                }
                 
                 var tname = "/cometd"+channel;