Changeset 42 for web

Timestamp:

02/07/08 15:46:20 (4 years ago)

Author:

mike

Message:

updated stuff

Location:

web/js

Files:

• jquery.comet.js (modified) (9 diffs)
• poker-client.js (modified) (3 diffs)

web/js/jquery.comet.js

@@ -18 +18 @@
                 this.connectionType = (this._bXD) ? 'callback-polling' : 'long-polling';
 
-                this.startup = function(oReturn)
+                this.startup = function(oReturn, fCallback)
                 {
                         if(this._comet._bConnected) return;
-                        this.tunnelInit();
-                };
-
-                this.tunnelInit = function()
+                        this.tunnelInit(fCallback);
+                };
+
+                this.tunnelInit = function(fCallback)
                 {
                         var msgConnect = 
@@ -34 +34 @@
                         };
 
-                        this.openTunnel(msgConnect);
-                };
-
-                this.openTunnel = function(oMsg)
+                        this.openTunnel(msgConnect,fCallback);
+                };
+
+                this.openTunnel = function(oMsg, fCallback)
                 {
                         $.comet._bPolling = true;
-
-                        this._send($.comet._sUrl, oMsg, function(sReturn)
-                        {
+                        var fc = fCallback;
+                        this._send($.comet._sUrl, [oMsg], function(sReturn)
+                        {
+                                if( fc ) { fc(); }
                                 var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
                                 $.comet._bPolling = false;
@@ -134 +135 @@
                                         type: 'post',
                                         beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
-                                        data: { message: JSON.stringify([oMsg]) },
+                                        data: { message: JSON.stringify(oMsg) },
                                         success: fCallback
                                 });
@@ -146 +147 @@
                                         data: 
                                         { 
-                                                message: JSON.stringify([$.extend(oMsg,{connectionType: 'callback-polling' })]) 
+                                                message: JSON.stringify($.extend(oMsg,{connectionType: 'callback-polling' })) 
                                         },
                                         success: fCallback
@@ -178 +179 @@
                 this._bTrigger = true; // this sends $.event.trigger(channel, data)
 
-                this.init = function(sUrl)
+                this.init = function(sUrl,fCallback)
                 {
                         this._sUrl = (sUrl) ? sUrl : '/cometd';
@@ -190 +191 @@
                         var oMsg = $.extend(msgHandshake, {id: this._nNextId++});
 
-                        this._oTransport._send(this._sUrl, oMsg, $.comet._finishInit);
-                };
-
-                this._finishInit = function(sReturn)
+                        this._oTransport._send(this._sUrl, [oMsg], function(sReturn){
+                                        $.comet._finishInit(sReturn, fCallback)});
+                };
+
+                this._finishInit = function(sReturn, fCallback)
                 {
                         var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')[0]) : sReturn[0];
@@ -211 +213 @@
                                 $.comet._oTransport.version = $.comet.version;
                                 $.comet.clientId = oReturn.clientId;
-                                $.comet._oTransport.startup(oReturn);
+                                $.comet._oTransport.startup(oReturn,fCallback);
                                 $.comet.endBatch();
                         }
-                };
-
-                this._sendMessage = function(oMsg)
+
+                };
+                //batch mode defaults to null
+                this._sendMessage = function(oMsg, batchMode)
                 {
                         if($.comet._nBatch <= 0)
@@ -231 +234 @@
                                         oMsg.id = $.comet._nNextId++;
                                 }
-
-                                $.comet._oTransport._send($.comet._sUrl, oMsg);
+                                if( batchMode )
+                                        $.comet._oTransport._send($.comet._sUrl, oMsg);
+                                else
+                                        $.comet._oTransport._send($.comet._sUrl, [oMsg]);
                         }
                         else
@@ -244 +249 @@
                 this.endBatch = function() {
                         if(--this._nBatch == 0)
-                        {
-                                this._sendMessage(this._aMessageQueue);
+                        {       
+                                if( this._aMessageQueue.length > 0 )
+                                        this._sendMessage(this._aMessageQueue, true);
 
                                 this._aMessageQueue = [];

web/js/poker-client.js

@@ -61 +61 @@
         }
         //Do status generating code here
-        var player_names = []
-
-
-                if( stat.table_info ) {
-                        ti = stat.table_info;
-                        player_names = ti.player_names;
-                        for( i in player_names ) {
-                                pn = player_names[i]
-                                        if( players[pn] == null ) { //if it's null let's create a new player object
-                                                newPlayer = baseplayer.clone(true);
-
-                                                players[pn] = new Player(newPlayer);
-                                                players[pn].id.text(pn);
-                                                if( pn == stat.you.id ) {
-                                                        you = players[stat.you.id]
-                                                                $("#you").append(you.pl) 
-                                                } else {
-                                                        player_status.append( newPlayer );
-                                                }
+        var player_names = [];
+
+
+        if( stat.table_info ) {
+                ti = stat.table_info;
+                player_names = ti.player_names;
+                for( i in player_names ) {
+                        pn = player_names[i]
+                                if( players[pn] == null ) { //if it's null let's create a new player object
+                                        newPlayer = baseplayer.clone(true);
+
+                                        players[pn] = new Player(newPlayer);
+                                        players[pn].id.text(pn);
+                                        if( pn == stat.you.id ) {
+                                                you = players[stat.you.id];
+                                                $("#you").append(you.pl);
+                                        } else {
+                                                player_status.append( newPlayer );
                                         }
-                                players[pn].updatePublic( ti.players[pn] );
-                        }
-                }
+                                }
+                        players[pn].updatePublic( ti.players[pn] );
+                }
+        }
         if( stat.game_state ) {
                 gs = stat.game_state;
@@ -174 +174 @@
         //$("form#connect_form").hide();
                 //
-                $.comet.init("/cometd");
-                $.comet.subscribe("/poker", processStatus);
+                $.comet.init("/cometd", function() {
+                        $.comet.subscribe("/poker", processStatus);})
 
                 sel = $('selector');
@@ -200 +200 @@
         });
 
+