Changeset 3314 for branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js

Timestamp:

09/30/10 17:21:21 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Na adicao de contatos ja esta sendo enviado o aceite do convite.

File:

• branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js (modified) (3 diffs)

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

@@ -640 +640 @@
         if( msg.getAttribute('from').toString().indexOf( TROPHYIM_CHATROOM ) < 0 )
         {       
-                TrophyIM.rosterObj.setPresence( msg.getAttribute('from'), priority, show, status );
+                        var _from = Strophe.getBareJidFromJid( msg.getAttribute('from') );
+                        var _flag = true;
+
+                if( TrophyIM.removeResult.idResult.length > 0 )
+                {
+                        for( var i = 0 ; i < TrophyIM.removeResult.idResult.length; i++ )
+                        {
+                                if( TrophyIM.removeResult.idResult[i] == _from )
+                                {
+                                        _flag = false;
+                                        
+                                        TrophyIM.removeResult.idResult.splice(i,1);
+                                        
+                                        i--;
+                                        
+                                        if( show.toLowerCase() === 'subscribe' )
+                                                _flag = true;
+                                }
+                        }
+                }
+                
+                if( _flag )
+                        TrophyIM.rosterObj.setPresence( msg.getAttribute('from'), priority, show, status );
         }
 
@@ -1151 +1173 @@
         addContact : function( jidTo, name, group )
         {
-                // Add Contact
-        var _id = TrophyIM.connection.getUniqueId('add'); 
-                var newContact = $iq({type: 'set', id: _id });
-                        newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
-                        newContact = newContact.c('item').attrs({jid: jidTo, name:name });
-                        newContact = newContact.c('group').t(group).tree();
-
-                TrophyIM.connection.send(newContact);
+                var _flag = true;
+
+                if( TrophyIM.removeResult.idResult.length > 0 )
+                {
+                        for( var i = 0 ; i < TrophyIM.removeResult.idResult.length; i++ )
+                        {
+                                if( TrophyIM.removeResult.idResult[i] == jidTo )
+                                {
+                                        _flag = false;
+                                        
+                                        TrophyIM.removeResult.idResult.splice(i,1);
+                                        
+                                        i--;
+                                }
+                        }
+                }
+                
+                if( _flag )
+                {       
+                // Add Contact
+                var _id = TrophyIM.connection.getUniqueId('add'); 
+                        var newContact = $iq({type: 'set', id: _id });
+                                newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
+                                newContact = newContact.c('item').attrs({jid: jidTo, name:name });
+                                newContact = newContact.c('group').t(group).tree();
+        
+                        TrophyIM.connection.send(newContact);
+                }
         },
 
@@ -1336 +1378 @@
                 
                 // Controller Result
-                //TrophyIM.removeResult.idResult[ TrophyIM.removeResult.idResult.length ] = jidTo;
+                TrophyIM.removeResult.idResult[ TrophyIM.removeResult.idResult.length ] = jidTo;
 
                 var delContact  = $iq({type: 'set', id: _id})