Changeset 2491 for sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

Timestamp:

04/12/10 15:50:03 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Implementado a parte de autorização ( to, from, both ). Ainda em teste.

File:

• sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js (modified) (13 diffs)

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -615 +615 @@
             var jid_lower       = barejid.toLowerCase();
             var contact         = "";
-                
+            contact                     = barejid.toLowerCase();
+                contact                 = contact.substring(0, contact.indexOf('@'));
+            
             if( TrophyIM.rosterObj.roster[barejid] )
             {
@@ -623 +625 @@
                     }
             }
-            else
-            {
-                contact = barejid.toLowerCase();
-                contact = contact.substring(0, contact.indexOf('@'));
-            }   
-            
+
             var message = 
             { 
@@ -670 +667 @@
         {
                 titleWindow = barejid.toLowerCase();
-                titleWindow = contact.substring(0, contact.indexOf('@'));
+                titleWindow = titleWindow.substring(0, titleWindow.indexOf('@'));
         }       
 
@@ -721 +718 @@
         
         // Add Contact
-        var _id = TrophyIM.connection.getUniqueId(); 
+        var _id = TrophyIM.connection.getUniqueId('add'); 
                 var newContact = $iq({type: 'set', id: _id });
                         newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
@@ -755 +752 @@
      */
     
-    removeContact : function(jidTo)
+    removeContact : function(jidTo, indexTo)
     {
-        var divItenContact = null;
+        var divItenContact       = null;
+        var spanShow             = null;
         
-        if( ( divItenContact = document.getElementById('itenContact_' + jidTo)))
+        if( ( divItenContact = document.getElementById('itenContact_' + jidTo + '_' + indexTo )))
         {       
+                spanShow = document.getElementById('span_show_itenContact_' + jidTo + '_' + indexTo )
+                
+                spanShow.parentNode.removeChild(spanShow);
+                
                 loadIM.removeGroup( divItenContact.parentNode );
                 
@@ -766 +768 @@
                 
                 // Remove Contact
-                        var _id = TrophyIM.connection.getUniqueId();    
+                        var _id = TrophyIM.connection.getUniqueId('del');       
                 var delContact  = $iq({type: 'set', id: _id})
                         delContact      = delContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
@@ -808 +810 @@
             }
             
-                        if( !flagGeral )
+                        if( !flagGeral && users.length > 0 )
                                 groups[groups.length] = "Geral";
                                 
@@ -889 +891 @@
                                 var element             = arguments[2];
                                 var index               = arguments[3];
-                                
+
                                 var itensJid    = document.getElementById( 'itenContact_' + objContact.contact.jid + '_' + index );
                                 
@@ -934 +936 @@
                                                 'presence'              : presence,
                                                 'status'                : status,
-                                                'statusDisplay' : statusDisplay
+                                                'statusDisplay' : statusDisplay,
+                                                'subscription'  : objContact.contact.subscription
                                         }
                                         
@@ -966 +969 @@
                                                 for ( var resource in objContact.presence )
                                                 {
-                                                        presence = objContact.presence[resource].show;
-                                                        
+                                                        if( objContact.presence[resource].show != 'invisible' )
+                                                                presence = objContact.presence[resource].show;
+
                                                         if( objContact.presence[resource].status )
                                                         {
@@ -990 +994 @@
                                         itensJid.style.background       = "url('"+path_jabberit+"templates/default/images/" + presence + ".gif')no-repeat center left";
                                 }
-                                
                         }
                 }
@@ -1032 +1035 @@
          */
 
-        setAutorization : function( jid )
-        {
-           TrophyIM.connection.send($pres( ).attrs( {to: jid, from: loadIM.getUserCurrent().jid, type:'subscribed'}).tree());
+        setAutorization : function( jidTo, jidFrom, _typeSubscription )
+        {
+        var _id = TrophyIM.connection.getUniqueId();
+        
+        TrophyIM.connection.send($pres( ).attrs( {to: jidTo, from: jidFrom, type: _typeSubscription, id: _id}).tree());
         },
     
@@ -1268 +1273 @@
                 var groups = this.roster[ jid ].contact.groups;
                 
-                for ( var i = 0; i < groups.length; i++ )
-                {
-                        delete this.groups[ groups[ i ] ][ jid ];
-                }
-
-                for ( var i = 0; i < groups.length; i++ )
-                {
-                        var contacts = 0;
-                        for ( var contact in this.groups[ groups[ i ] ] )
-                                contacts++;
-
-                        if ( ! contacts )
-                                delete this.groups[ groups[ i ] ];
+                if( groups )
+                {
+                        
+                        for ( var i = 0; i < groups.length; i++ )
+                        {
+                                delete this.groups[ groups[ i ] ][ jid ];
+                        }
+
+                        for ( var i = 0; i < groups.length; i++ )
+                        {
+                                var contacts = 0;
+                                for ( var contact in this.groups[ groups[ i ] ] )
+                                        contacts++;
+        
+                                if ( ! contacts )
+                                        delete this.groups[ groups[ i ] ];
+                        }
                 }