Changeset 7567

Timestamp:

03/09/07 02:38:10 (21 months ago)

Author:

alex

Message:

fixes #2519

Files:

• branches/0.4/src/io/cometd.js (modified) (4 diffs)
• trunk/src/io/cometd.js (modified) (4 diffs)

branches/0.4/src/io/cometd.js

@@ -191 +191 @@
                 this.currentTransport.deliver(message);
 
-                // dispatch the message to any locally subscribed listeners
-                var tname = (this.globalTopicChannels[message.channel]) ? message.channel : "/cometd"+message.channel;
-                dojo.event.topic.publish(tname, message);
+                if(message.data){
+                        // dispatch the message to any locally subscribed listeners
+                        var tname = (this.globalTopicChannels[message.channel]) ? message.channel : "/cometd"+message.channel;
+                        dojo.event.topic.publish(tname, message);
+                }
         }
 
@@ -793 +795 @@
                                 method: "post",
                                 mimetype: "text/json",
-                                content: { message: dojo.json.serialize([ message ]) }
+                                content: { message: dojo.json.serialize([ message ]) },
+                                load: dojo.lang.hitch(this, function(type, data, evt, args){ cometd.deliver(data); }) 
                         };
                         return dojo.io.bind(bindArgs);
@@ -870 +873 @@
                         jsonParamName: "jsonp",
                         load: dojo.lang.hitch(this, function(type, data, evt, args){
-                                dojo.debug(dojo.json.serialize(data));
+                                // dojo.debug(dojo.json.serialize(data));
                                 cometd.deliver(data);
                                 this.connected = false;
@@ -896 +899 @@
                                 transport: "ScriptSrcTransport",
                                 jsonParamName: "jsonp",
-                                content: { message: dojo.json.serialize([ message ]) }
+                                content: { message: dojo.json.serialize([ message ]) },
+                                load: dojo.lang.hitch(this, function(type, data, evt, args){ cometd.deliver(data); }),
                         };
                         return dojo.io.bind(bindArgs);

trunk/src/io/cometd.js

@@ -191 +191 @@
                 this.currentTransport.deliver(message);
 
-                // dispatch the message to any locally subscribed listeners
-                var tname = (this.globalTopicChannels[message.channel]) ? message.channel : "/cometd"+message.channel;
-                dojo.event.topic.publish(tname, message);
+                if(message.data){
+                        // dispatch the message to any locally subscribed listeners
+                        var tname = (this.globalTopicChannels[message.channel]) ? message.channel : "/cometd"+message.channel;
+                        dojo.event.topic.publish(tname, message);
+                }
         }
 
@@ -793 +795 @@
                                 method: "post",
                                 mimetype: "text/json",
-                                content: { message: dojo.json.serialize([ message ]) }
+                                content: { message: dojo.json.serialize([ message ]) },
+                                load: dojo.lang.hitch(this, function(type, data, evt, args){ cometd.deliver(data); }) 
                         };
                         return dojo.io.bind(bindArgs);
@@ -870 +873 @@
                         jsonParamName: "jsonp",
                         load: dojo.lang.hitch(this, function(type, data, evt, args){
-                                dojo.debug(dojo.json.serialize(data));
+                                // dojo.debug(dojo.json.serialize(data));
                                 cometd.deliver(data);
                                 this.connected = false;
@@ -896 +899 @@
                                 transport: "ScriptSrcTransport",
                                 jsonParamName: "jsonp",
-                                content: { message: dojo.json.serialize([ message ]) }
+                                content: { message: dojo.json.serialize([ message ]) },
+                                load: dojo.lang.hitch(this, function(type, data, evt, args){ cometd.deliver(data); }),
                         };
                         return dojo.io.bind(bindArgs);