Changeset 2988 for trunk

Timestamp:

07/01/10 15:16:19 (14 years ago)

Author:

alexandrecorreia

Message:

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

Location:

trunk/jmessenger

Files:

• js/jscode/loadIM.js (modified) (3 diffs)
• js/trophyim.js (modified) (7 diffs)
• templates/default/images/subscribed.gif (added)

trunk/jmessenger/js/jscode/loadIM.js

@@ -344 +344 @@
                         var _options = [
                                                 ['Adicionar Contato', 'loadscript.addContact();' ],
-                                                ['Ajuda', 'alert("2")' ],
                                                 ['Preferências', 'loadscript.preferences();'],
                                                    ];
@@ -769 +768 @@
                 {
                         var _element = arguments[0] 
-                        var _parent  = _element.parentNode;
-                        
-                        if( _element )
-                                _parent.removeChild( _element );
+                        
+                        if( _element != null )
+                        {
+                                _element.parentNode.removeChild( _element );
+                        }
                 }
         }
@@ -916 +916 @@
                                 
                                         break;
-                                        
-                                default :
-                                        alert( "SEM PARAMETRO DEFINIDO : " + subscription );
-                                        
                 }
         }

trunk/jmessenger/js/trophyim.js

@@ -1043 +1043 @@
     {
         var divItenContact       = null;
-        var spanShow             = null;
 
         if( ( divItenContact = document.getElementById('itenContact_' + jidTo )))
         {       
-                loadscript.removeElement( document.getElementById('itenContactNotification_' + jidTo ) );
-                
-                spanShow = document.getElementById('span_show_itenContact_' + jidTo )
-                
-                spanShow.parentNode.removeChild(spanShow);
-                
-                loadscript.removeGroup( divItenContact.parentNode );
-                
-                divItenContact.parentNode.removeChild(divItenContact);
-                
                 // Remove Contact
                 var _id = TrophyIM.connection.getUniqueId();    
@@ -1063 +1052 @@
                         delContact      = delContact.c('item').attrs({jid: jidTo, subscription:'remove'}).tree();
 
-                TrophyIM.connection.send( delContact );                 
+                TrophyIM.connection.send( delContact );
+                
+                        loadscript.removeElement( document.getElementById('itenContactNotification_' + jidTo ) );
+                
+                var spanShow = document.getElementById('span_show_itenContact_' + jidTo )
+                        spanShow.parentNode.removeChild(spanShow);
+                
+                loadscript.removeGroup( divItenContact.parentNode );
+                
+                divItenContact.parentNode.removeChild(divItenContact);
         }
     },
@@ -1263 +1261 @@
                                                                 statusColor     = "orange";     
                                                                 break;
-                                                                
-                                                        default:
-                                                                paramsContact.status = " ( SEM PARAMETRO DEFINIDO" + objContact.contact.subscription + " ) ";
                                                 }
 
@@ -1372 +1367 @@
                                                 
                                                 itensJid.style.background       = "url('"+path_jabberit+"templates/default/images/" + presence + ".gif') no-repeat center left";
-                                                
                                         }
         
@@ -1702 +1696 @@
         this.addContact = function(jid, subscription, name, groups )
         {
-                if( subscription === "remove" || subscription == "remove")
+                if( subscription.indexOf("remove") >= 0 )       
         {
                         this.removeContact(jid);
@@ -1866 +1860 @@
         var jid_lower   = barejid.toLowerCase();
         
-                if( show != 'unavailable')
+        if( show != 'unavailable' && show != 'error' )
                 {
             if (!this.roster[jid_lower])
@@ -1888 +1882 @@
             this.roster[jid_lower]['presence'][resource] = presence;
         }
-                else if (this.roster[jid_lower] && this.roster[jid_lower]['presence'] && this.roster[jid_lower]['presence'][resource])
-                {
-            delete this.roster[jid_lower]['presence'][resource];
+        else 
+                {
+                delete this.roster[jid_lower];
         }