Changeset 3124

Timestamp:

08/03/10 11:57:50 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1091 - Implementado a busca de salas para bate-papo no novo modulo Expresso messenger XEP-0045-MUC.

Location:

branches/2.2/jabberit_messenger/jmessenger/js

Files:

• jscode/loadIM.js (modified) (1 diff)
• trophyim.js (modified) (3 diffs)

branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js

@@ -1414 +1414 @@
                                 
                                         show( );
-                                },
-                                500
-                        );
+                                        
+                                }, 500 );
                 };
 
-                for ( var i = 0; i < element.length; i++ )
-                {
-                        _get_room_info( element[ i ].getAttribute( 'jid' ) );
-                }
-                
+                if( element.length > 0 )
+                {
+                        for ( var i = 0; i < element.length; i++ )
+                        {
+                                _get_room_info( element[ i ].getAttribute( 'jid' ) );
+                        }
+                }
+                else
+                {
+                        show();
+                }
         }
         

branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js

@@ -1099 +1099 @@
         {
                 TrophyIM.leaveChatRoom( jidChatRoom );
+                
+                if( TrophyIM.activeChatRoom.name.length > 0 )
+                {
+                        for( var i = 0;  i < TrophyIM.activeChatRoom.name.length ; i++ )
+                        {
+                                if( TrophyIM.activeChatRoom.name[i].indexOf( jidChatRoom ) >= 0 )
+                                {
+                                        TrophyIM.activeChatRoom.name[i] = "";
+                                }
+                        }
+                }
 
                 setTimeout( function()
@@ -1300 +1311 @@
     getListRooms : function()
     {
-        var _error_return = function(element)
+        if( TrophyIM.statusConn.connected )
         {
-                alert( " ERROR : " + element );
-        };
-        
-                var iq = $iq({to: "conference.im.pr.gov.br", type: "get"}).c("query",{xmlns: Strophe.NS.DISCO_ITEMS});                  
-                
-        TrophyIM.connection.sendIQ( iq, loadscript.listRooms, _error_return, 500 );             
+                var _error_return = function(element)
+                {
+                        alert("ERRO : Tente novamente !");
+                };
+                
+                        var iq = $iq({ to: TROPHYIM_CHATROOM, type: "get" }).c("query",{xmlns: Strophe.NS.DISCO_ITEMS });               
+                        
+                TrophyIM.connection.sendIQ( iq, loadscript.listRooms, _error_return, 500 );
+        }else
+                alert( "ERRO : Sem conexão com o servidor " + TROPHYIM_CHATROOM );
+                    
     },
     
@@ -1864 +1880 @@
                         for( var i in TrophyIM.activeChatRoom.name )
                         {
-                                TrophyIM.connection.send($pres( { to : TrophyIM.activeChatRoom.name[i] } ).c('show').t( presence_chatRoom ) );
+                                if( TrophyIM.activeChatRoom.name[i] != "" )
+                                        TrophyIM.connection.send($pres( { to : TrophyIM.activeChatRoom.name[i] } ).c('show').t( presence_chatRoom ) );
                         }
                 }