Changeset 2975 for trunk/jmessenger/js/jscode/loadIM.js

Timestamp:

06/28/10 12:13:37 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1116 - Melhorar a visualizacao/avisos de novos contatos e pedidos de autorizacao no modulo.

File:

• trunk/jmessenger/js/jscode/loadIM.js (modified) (15 diffs)

trunk/jmessenger/js/jscode/loadIM.js

@@ -57 +57 @@
                         var _element    = ( e.target ) ? e.target : e.srcElement;
                         var jid         = arguments[1];
-                        var index       = arguments[2];
                         var coord       = null;
 
@@ -79 +78 @@
                         {
                                 if( e.button > 1 )
-                                        optionsItensContact( jid, index, coord );
+                                        optionsItensContact( jid, coord );
                                 else
                                         TrophyIM.rosterClick(jid);
@@ -86 +85 @@
                         {
                                 if( e.which > 1 )
-                                        optionsItensContact( jid, index, coord );
+                                        optionsItensContact( jid, coord );
                                 else
                                         if( e.target.id )
@@ -281 +280 @@
                 }
         }
-        
+
+        function disabledNotificationNewUsers()
+        {
+                var _notification       = getElement('notification_new_users_jabber') ;
+                var _statusJabber       = getElement('status_jabber_expresso');
+
+                _notification.style.display = 'none';
+                
+                _statusJabber.style.background = "url('"+path_jabberit+"templates/default/images/" + statusUserIM + ".gif') no-repeat";
+                
+                if( _timeOutNotification )
+                        clearTimeout(_timeOutNotification );
+                
+                TrophyIM.controll.notificationNewUsers = 0;
+        }
+        
+        function enabledNotificationNewUsers()
+        {
+                var _notification       = getElement('notification_new_users_jabber') ;
+                var _statusJabber       = getElement('status_jabber_expresso');
+        
+                if( _notification && _statusJabber )
+                {       
+                        if ( _notification.style.display == 'none' )
+                        {
+                                _notification.style.display = 'block';
+                                
+                                _statusJabber.style.background = "url('"+path_jabberit+"templates/default/images/alert_mini.png') no-repeat";
+                                
+                                if( _timeOutNotification )
+                                        clearTimeout(_timeOutNotification );
+
+                                _timeOutNotification = setTimeout( function(){ enabledNotificationNewUsers(); }, 2000 );
+                        }
+                        else
+                        {
+                                _notification.style.display = 'none';
+                                
+                                _statusJabber.style.background = "url('"+path_jabberit+"templates/default/images/" + statusUserIM + ".gif') no-repeat";
+                                
+                                if( _timeOutNotification )
+                                        clearTimeout(_timeOutNotification );
+
+                                _timeOutNotification = setTimeout( function(){ enabledNotificationNewUsers(); }, 800 );
+                        }
+                }
+        }
+
         function fastMenu()
         {
@@ -579 +625 @@
                 {
                         var jid         = arguments[0];
-                        var index       = arguments[1];
-                        var coord       = arguments[2];
-                        var element = getElement('itenContact_' + jid + '_' + index );
+                        var coord       = arguments[1];
+                        var element = getElement('itenContact_' + jid );
                         var action      = ( element.getAttribute("subscription") === "not-in-roster" ) ? "Adicionar" : "Autorizar";     
                         
@@ -588 +633 @@
 
                         var _options = [
-                                                [ action , 'loadscript.setAutorization(\''+jid+'\',\''+index+'\')'],
-                                                ['Remover' , 'loadscript.removeContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Renomear' , 'loadscript.renameContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Trocar grupo' , 'loadscript.renameGroup(\''+jid+'\',\''+index+'\')']
+                                                [ action , 'loadscript.setAutorization(\''+jid+'\')'],
+                                                ['Remover' , 'loadscript.removeContact(\''+jid+'\')'],
+                                                ['Renomear' , 'loadscript.renameContact(\''+jid+'\')'],
+                                                ['Trocar grupo' , 'loadscript.renameGroup(\''+jid+'\')']
                                                    ];
 
@@ -709 +754 @@
         }
         
-        function removeContact(jid, index)
-        {
-                setTimeout(function()
-                {
-                        TrophyIM.removeContact(jid, index);
-                        
-                },300);
+        function removeContact( jid )
+        {
+                TrophyIM.removeContact( jid );
         }
         
@@ -742 +783 @@
                 {
                         var _jid        = arguments[0];
-                        var _index      = arguments[1];
-                        
-                        TrophyIM.renameContact( _jid, _index );
+                        
+                        TrophyIM.renameContact( _jid );
                 }
         }
@@ -753 +793 @@
                 {
                         var _jid        = arguments[0];
-                        var _index      = arguments[1];
-                        
-                        TrophyIM.renameGroup( _jid , _index );
+                        
+                        TrophyIM.renameGroup( _jid );
                 }
         }
@@ -815 +854 @@
         }
         
-        function setAutorization(jidTo, indexTo)
-        {
-        var divItenContact = null;
-        
-        if( ( divItenContact = getElement('itenContact_' + jidTo + '_' + indexTo )))
+        function setAutorization()
+        {
+                var divItenContact = null;
+                
+                if( arguments.length > 0 )
+                {
+                        var jidTo = arguments[0];
+                
+                        if( getElement('itenContact_' + jidTo) )
+                                divItenContact = getElement('itenContact_' + jidTo );
+                }
+                
+        if( divItenContact )
         {       
                 var subscription = divItenContact.getAttribute('subscription');
-                
+
                 switch(subscription)
                 {
@@ -845 +892 @@
                                         if( ( _add = confirm("Deseja adicionar o usuario!")) )          
                                         {
-                                                addUser.add( jidTo, indexTo );
+                                                addUser.add( jidTo );
                                         }
                                         
@@ -863 +910 @@
                                         
                                 default :
+                                        alert( "SEM PARAMETRO DEFINIDO : " + subscription );
                                         
-                                        alert( "DEFAULT : " + subscription );
                 }
-        }       
+        }
+        
+        setTimeout(function()
+        {
+                        if( getElement('itenContactNotification_' + jidTo ) )
+                                loadscript.removeElement( getElement('itenContactNotification_' + jidTo ) );
+        },500);
+    
         }
         
@@ -1170 +1224 @@
                                         var _user       = _users.createElement('user');
                                         var _jid        = _users.createElement('jid');
-                                        var _index      = _users.createElement('index');
+                                        var _status     = _users.createElement('status');
                                         _jid.appendChild( _users.createTextNode(TrophyIM.rosterObj.roster[user].contact.jid) );
-                                        _index.appendChild( _users.createTextNode("0"));
+                                        _status.appendChild( _users.createTextNode( _subscription ) );
                                         _user.appendChild( _jid );
-                                        _user.appendChild( _index );
+                                        _user.appendChild( _status );
                                         _users.documentElement.appendChild( _user );
                                 }
@@ -1206 +1260 @@
                 _winBuild( winNotification );
         }
-        
-        function teste_new()
-        {
-                var _notification       = getElement('notification_new_users_jabber') ;
-                var _statusJabber       = getElement('status_jabber_expresso');
-        
-                if( _notification && _statusJabber )
-                {       
-                        if ( _notification.style.display == 'none' )
-                        {
-                                _notification.style.display = 'block';
-                                
-                                _statusJabber.style.background = "url('"+path_jabberit+"templates/default/images/alert_mini.png') no-repeat";
-                                
-                                if( _timeOutNotification )
-                                        clearTimeout(_timeOutNotification );
-
-                                _timeOutNotification = setTimeout( function(){ teste_new(); }, 2000 );
-                        }
-                        else
-                        {
-                                _notification.style.display = 'none';
-                                
-                                _statusJabber.style.background = "url('"+path_jabberit+"templates/default/images/" + statusUserIM + ".gif') no-repeat";
-                                
-                                if( _timeOutNotification )
-                                        clearTimeout(_timeOutNotification );
-
-                                _timeOutNotification = setTimeout( function(){ teste_new(); }, 800 );
-                        }
-                }
-        }
-        
-        
-        loadIM.prototype.teste_new = teste_new;
-        
-        
+
         function loadIM()
         {
@@ -1320 +1338 @@
         loadIM.prototype.clrAllContacts         = clrAllContacts;
         loadIM.prototype.configEvents           = configEvents;
+        loadIM.prototype.disabledNotificationNewUsers   = disabledNotificationNewUsers;
+        loadIM.prototype.enabledNotificationNewUsers    = enabledNotificationNewUsers;  
         loadIM.prototype.getIsIE                        = getIsIE;
         loadIM.prototype.getPhotoUser           = getPhotoUser;