Changeset 2994

Timestamp:

07/05/10 15:52: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/js

Files:

• AddUser.js (modified) (1 diff)
• jscode/loadIM.js (modified) (2 diffs)
• trophyim.js (modified) (7 diffs)

trunk/jmessenger/js/AddUser.js

@@ -79 +79 @@
                         if( jidFrom != jidTo )
                         {
+                                TrophyIM.rosterObj.removeContact( jidTo );
+                                
                                 // Remove Element
                                 loadscript.removeElement( getElement('itenContact_' + jidTo ) );
                                 loadscript.removeElement( getElement('span_show_itenContact_' + jidTo ) );
                                 loadscript.removeElement( getElement('itenContactNotification_' + jidTo ) );
-        
-                                TrophyIM.rosterObj.removeContact( jidTo );
 
                                 TrophyIM.addContact( jidTo, name, group );

trunk/jmessenger/js/jscode/loadIM.js

@@ -878 +878 @@
                 switch(subscription)
                 {
-                        case 'from':
+                                case 'from':
+                                case 'subscribe' :
+                                        
+                                        TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
+                                break;
+                                
+                                case 'none' :                                   
                                 
                                 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
+                                //TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
                                 break;
-
-                        case 'none' :
                                 
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
+                        case 'to' :                             
+                                
                                 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
-                                
+                                removeElement( getElement('itenContactNotification_' + jidTo ) );                               
                                 break;
 
                         case 'not-in-roster':
                                         
-                                setTimeout(function()
+                                /*setTimeout(function()
                                         {
                                         var _add = "";
@@ -901 +907 @@
                                         }
                                         
-                                        },100);
+                                        },100);*/
+                                
+                                        addUser.add( jidTo );
                                 
                                         break;
                                         
-                        case 'to' :
-
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
-                                
-                                removeElement( getElement('itenContactNotification_' + jidTo ) );
+                                default:
                                         
-                        case 'subscribe' :
-                                
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
-                                
-                                        break;
+                                        alert( "EU NÃO SEI : " + subscription );
                 }
         }

trunk/jmessenger/js/trophyim.js

@@ -594 +594 @@
                                                 group_array[group_array.length] = groups[g].firstChild.nodeValue;
                                 }
-                                
-                                if( getAttribute('ask') )
-                                        TrophyIM.rosterObj.addContact(getAttribute('jid'), getAttribute('ask'), getAttribute('name'), group_array);
+
+                                if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" )
+                                {
+                                        if( getAttribute('subscription').toString() === "none" )
+                                        {
+                                                TrophyIM.rosterObj.addContact( getAttribute('jid'), getAttribute('ask'), getAttribute('name'), group_array );
+                                        }
+                                        
+                                        if( getAttribute('subscription').toString() === "remove" )
+                                        {
+                                                TrophyIM.rosterObj.removeContact(getAttribute('jid'));
+                                        }
+                                }
                                 else
-                                        TrophyIM.rosterObj.addContact(getAttribute('jid'), getAttribute('subscription'), getAttribute('name'), group_array);
+                                {
+                                        if( getAttribute('subscription').toString() === "remove" )
+                                        {
+                                                TrophyIM.rosterObj.removeContact(getAttribute('jid'));
+                                        }
+                                        else
+                                        {
+                                                TrophyIM.rosterObj.addContact( getAttribute('jid'), getAttribute('subscription'), getAttribute('name'), group_array );
+                                        }
+                                }
                         }
         }
@@ -1246 +1265 @@
                                                         case "from" :
                                                                 
-                                                                status          = " (( " + i18n.AUTH_ASK + " )) ";
+                                                                status          = " (( " + i18n.AUTHORIZED + " )) ";
                                                                 statusColor = "green";
                                                                 break;
@@ -1260 +1279 @@
                                                                 status          = " (( " + i18n.ASK_FOR_AUTH_QUESTION  + " )) ";
                                                                 statusColor     = "orange";     
+                                                                break;
+                                                                
+                                                        default :
+                                                                
                                                                 break;
                                                 }
@@ -1397 +1420 @@
                                 var _subscription = TrophyIM.rosterObj.roster[users[i]].contact.subscription;
                                 
-                                if( _subscription == "to" || _subscription == "not-in-roster")
+                                if( _subscription === "to" )
+                                {
+                                        flag = true;
+                                }
+                                
+                                if(  _subscription === "not-in-roster")
                                 {
                                         flag = true;
@@ -1458 +1486 @@
         var _id = TrophyIM.connection.getUniqueId();
         
-        TrophyIM.connection.send($pres( ).attrs( {to: jidTo, from: jidFrom, type: _typeSubscription, id: _id}).tree());
+        TrophyIM.connection.send($pres( ).attrs({ from: jidFrom, to: jidTo, type: _typeSubscription, id: _id }).tree());
         },
     
@@ -1696 +1724 @@
         this.addContact = function(jid, subscription, name, groups )
         {
-                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 )
+                if( subscription === "remove" )
         {
                         this.removeContact(jid);
@@ -1759 +1753 @@
                                 this.groups[groups[g]][jid_lower] = jid_lower;
                 }
-        }*/
+        }
     }