Changeset 2990

Timestamp:

07/01/10 16:08:06 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1116 - As vezes a operacao de remover um contato da lista nao funcionava direito.

Location:

trunk/jmessenger/js

Files:

• AddUser.js (modified) (1 diff)
• trophyim.js (modified) (2 diffs)

trunk/jmessenger/js/AddUser.js

@@ -41 +41 @@
                         else
                         {       
-                                var jidFrom             = loadscript.getUserCurrent().jid;
+                                var jidFrom             = Base64.decode( loadscript.getUserCurrent().jid );
                                 var jidTo               = getElement('user_jid_jabberIM').value;
                                 var name                = getElement('user_name_jabberIM').value;

trunk/jmessenger/js/trophyim.js

@@ -1696 +1696 @@
         this.addContact = function(jid, subscription, name, groups )
         {
-                if( subscription.indexOf("remove") >= 0 )       
+                switch( subscription )
+                {
+                        case 'remove'   :
+
+                                this.removeContact(jid);
+                                break;
+                                
+                        default :
+                                
+                                var contact             = { jid:jid, subscription:subscription, name:name, groups:groups }
+                        var jid_lower   = jid.toLowerCase();
+                
+                                if ( this.roster[jid_lower] )
+                                {
+                            this.roster[jid_lower]['contact'] = contact;
+                        }
+                                else
+                                {
+                            this.roster[jid_lower] = {contact:contact};
+                        }
+        
+                                groups = groups ? groups : [''];
+                        
+                                for ( var g = 0; g < groups.length; g++ )
+                                {
+                                        if ( !this.groups[groups[g]] )
+                                        {
+                                this.groups[groups[g]] = {};
+                            }
+                            
+                                        this.groups[groups[g]][jid_lower] = jid_lower;
+                        }
+                }
+                
+                /*if( subscription.indexOf("remove") >= 0 )
         {
                         this.removeContact(jid);
@@ -1725 +1759 @@
                                 this.groups[groups[g]][jid_lower] = jid_lower;
                 }
-        }
+        }*/
     }