Changeset 3004 for trunk

Timestamp:

07/06/10 17:17:36 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1116 - Melhorias para a implementacao  http://xmpp.org/rfcs/rfc3921, secao 8.3, happy path

Location:

trunk/jmessenger/js

Files:

• AddUser.js (modified) (2 diffs)
• trophyim.js (modified) (4 diffs)

trunk/jmessenger/js/AddUser.js

@@ -13 +13 @@
                                 var name                = jidTo.substring(0, jidTo.indexOf('@'));
 
-                                var _groups             = "Sem Grupos";
+                                var _groups             = "";
 
                                 if( TrophyIM.rosterObj)
                                 {
-                                        _groups = "Geral";
-                                        
                                         for (var group in TrophyIM.rosterObj.groups)
                                         {
@@ -185 +183 @@
                         var infoUser    = null;         
                         var img                 = document.createElement('img');
-                        var _groups             = "Sem Grupos";
+                        var _groups             = "";
 
                         if( TrophyIM.rosterObj)
                         {
-                                _groups = "";
-                                
                                 for (var group in TrophyIM.rosterObj.groups)
                                 {

trunk/jmessenger/js/trophyim.js

@@ -594 +594 @@
                                                 group_array[group_array.length] = groups[g].firstChild.nodeValue;
                                 }
-
-                                /*if( getAttribute('jid') == 'teste9@im.pr.gov.br' || getAttribute('jid') == 'alexandrecorreia@im.pr.gov.br' )
-                                {
-                                        alert(  "JID : " + getAttribute('jid') + "\n" +
-                                                        "ASK : " + getAttribute('ask') + "\n" + 
-                                                        "SUBSCRIPTION : " + getAttribute('subscription') );
-                                }*/
-                                
-                                
-                                if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" )
+                                
+                                if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" ) 
                                 {
                                         if( getAttribute('subscription').toString() === "none" )
@@ -617 +609 @@
                                 else
                                 {
-                                        if( getAttribute('subscription').toString() === "remove" )
+                                        if( ( getAttribute('ask') == null && getAttribute('subscription').toString() === "remove" ) || getAttribute('subscription').toString() === "remove" )
                                         {
                                                 TrophyIM.rosterObj.removeContact( getAttribute('jid').toString() );
@@ -1896 +1888 @@
         var jid_lower   = barejid.toLowerCase();
         
-        /**
-         * COMENTADO PARA TESTES
-         * 
-        if( show != 'unavailable' && show != 'error' )
-        if( show != 'unavailable' )
-                {
-        */
+        if( show != 'unavailable' || show != 'error' )
+                {
             if (!this.roster[jid_lower])
                         {
-                this.addContact(barejid, 'not-in-roster');
+                this.addContact( barejid, 'not-in-roster' );
             }
             
@@ -1922 +1909 @@
             
             this.roster[jid_lower]['presence'][resource] = presence;    
-
-       /**      
-         * COMENTADO PARA TESTES
-         *
-        }
-        else 
-                {
-                delete this.roster[jid_lower];
-        }
-        
-                this.addChange(jid_lower);
-                */
+                }
     }