Changeset 3092 for trunk

Timestamp:

07/27/10 14:26:14 (14 years ago)

Author:

alexandrecorreia

Message:

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

Location:

trunk/jabberit_messenger/jmessenger/js

Files:

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

trunk/jabberit_messenger/jmessenger/js/jscode/loadIM.js

@@ -1413 +1413 @@
             }
                 
+            
+            
             var room_nick = test_append_nick( jidRoom, "USUARIO_DE_TESTE" );
             

trunk/jabberit_messenger/jmessenger/js/trophyim.js

@@ -670 +670 @@
                                 nameChatRoom = Strophe.getBareJidFromJid(nameChatRoom);
 
-                        var nickName = xquery[i].firstChild.getAttribute('jid');
-                                nickName = Strophe.getBareJidFromJid( nickName );
-                                nickName = nickName.substring(0, nickName.indexOf('@'));
+                        var nickName = xquery[i].parentNode.getAttribute('from');
+                                nickName = Strophe.getResourceFromJid(nickName);
                         
                         var type = xquery[i].parentNode.getAttribute('type') ? xquery[i].parentNode.getAttribute('type') : 'available' ;
@@ -678 +677 @@
                         var show = ( xquery[i].parentNode.firstChild.firstChild != null ) ? xquery[i].parentNode.firstChild.firstChild.nodeValue : type ;
                         
-                        if ( Strophe.getBareJidFromJid( xquery[i].firstChild.getAttribute('jid') ) == Strophe.getBareJidFromJid( TrophyIM.connection.jid ) )
-                                show = loadscript.getStatusUserIM();
+                        if( xquery[i].firstChild.getAttribute('jid') )
+                        {
+                                if ( Strophe.getBareJidFromJid( xquery[i].firstChild.getAttribute('jid') ) == Strophe.getBareJidFromJid( TrophyIM.connection.jid ) )
+                                        show = loadscript.getStatusUserIM();
+                        }
                         
                         var _UserChatRoom = document.createElement("div");
@@ -688 +690 @@
                         var nodeUser = document.getElementById( nameChatRoom + "_UserChatRoom__" + xquery[i].firstChild.getAttribute('jid'));           
                                 
-                        if( nodeUser == null )
+                        if( nodeUser == null && xquery[i].firstChild.getAttribute('jid') )
                         {
                                 nameChatRoom = document.getElementById(nameChatRoom + '__roomChat__participants');
@@ -697 +699 @@
                                 if( type == 'unavailable' )
                                 {
-                                        nodeUser.parentNode.removeChild( nodeUser );
+                                        var nodeUser = document.getElementById( nameChatRoom + "_UserChatRoom__" + xquery[i].parentNode.getAttribute('to'));
+                                                nodeUser.parentNode.removeChild( nodeUser );
                                 }
                                 else if( show )
                                 {
                                         var _UserChatRoom = document.getElementById( nameChatRoom + "_UserChatRoom__" + xquery[i].firstChild.getAttribute('jid') )
-                                        
-                                        _UserChatRoom.setAttribute("style","padding-left:18px ; margin:3px 0px 0px 2px; background: url('"+path_jabberit+"templates/default/images/" + show + ".gif')no-repeat center left");   
+                                                _UserChatRoom.setAttribute("style","padding-left:18px ; margin:3px 0px 0px 2px; background: url('"+path_jabberit+"templates/default/images/" + show + ".gif')no-repeat center left");   
                                 }
                         }
@@ -1233 +1235 @@
     joinChatRoom : function( roomName )
     {
-        var presence = $pres({from: TrophyIM.connection.jid, to: roomName}).c("x",{xmlns: Strophe.NS.MUC});
-        
+        var presence = $pres({from: TrophyIM.connection.jid, to: roomName}).c("x",{xmlns: Strophe.NS.MUC});
+        
                 TrophyIM.connection.send( presence );
     },
@@ -1243 +1245 @@
      */
     
-    leaveChatRoom : function( roomName)
+    leaveChatRoom : function( roomName )
     {
-        var room_nick = roomName;        
-        var presenceid = TrophyIM.connection.getUniqueId();
-        //var presence = $pres( {type: "unavailable", id: presenceid, to: room_nick} ).c("x",{ xmlns: Strophe.NS.MUC } );
-        //TrophyIM.connection.send( presence );
+        var room_nick   = roomName + "/USUARIO_DE_TESTE"; 
+        
+        var presenceid  = TrophyIM.connection.getUniqueId();
+        
+        var presence    = $pres( {type: "unavailable", id: presenceid, from: TrophyIM.connection.jid, to: room_nick} ).c("x",{xmlns: Strophe.NS.MUC});
+        
+        TrophyIM.connection.send( presence );        
     },