Changeset 2971 for trunk/jmessenger/js/trophyim.js

Timestamp:

06/25/10 17:59:42 (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/trophyim.js (modified) (19 diffs)

trunk/jmessenger/js/trophyim.js

@@ -345 +345 @@
     log : function(level, msg)
     {
-        if (TrophyIM.logging_div && level >= TROPHYIM_LOGLEVEL) {
-            while(TrophyIM.logging_div.childNodes.length > TROPHYIM_LOG_LINES) {
-                TrophyIM.logging_div.removeChild(
-                TrophyIM.logging_div.firstChild);
+        if (TrophyIM.logging_div && level >= TROPHYIM_LOGLEVEL)
+        {
+            while(TrophyIM.logging_div.childNodes.length > TROPHYIM_LOG_LINES)
+            {
+                TrophyIM.logging_div.removeChild( TrophyIM.logging_div.firstChild );
             }
+            
             var msg_div = document.createElement('div');
             msg_div.className = 'trophyimlogitem';
             msg_div.appendChild(document.createTextNode(msg));
+            
             TrophyIM.logging_div.appendChild(msg_div);
             TrophyIM.logging_div.scrollTop = TrophyIM.logging_div.scrollHeight;
@@ -589 +592 @@
                                                 group_array[group_array.length] = groups[g].firstChild.nodeValue;
                                 }
-
+                                
                                 if( getAttribute('ask') )
                                         TrophyIM.rosterObj.addContact(getAttribute('jid'), getAttribute('ask'), getAttribute('name'), group_array);
@@ -966 +969 @@
      */
     
-    renameContact : function( jid, index )
+    renameContact : function( jid )
     {
         // Name
@@ -984 +987 @@
         TrophyIM.addContact( jidTo, name, group );
         
-        document.getElementById('itenContact_' + jid + '_' + index).innerHTML = name;
+        document.getElementById('itenContact_' + jid ).innerHTML = name;
     },
     
@@ -992 +995 @@
      */
 
-    renameGroup : function( jid, index)
+    renameGroup : function( jid )
     {
         var group               = TrophyIM.rosterObj.roster[jid].contact.groups[0];
@@ -1035 +1038 @@
      */
     
-    removeContact : function(jidTo, indexTo)
+    removeContact : function( jidTo )
     {
         var divItenContact       = null;
         var spanShow             = null;
         
-        if( ( divItenContact = document.getElementById('itenContact_' + jidTo + '_' + indexTo )))
+        if( ( divItenContact = document.getElementById('itenContact_' + jidTo )))
         {       
-                spanShow = document.getElementById('span_show_itenContact_' + jidTo + '_' + indexTo )
+                spanShow = document.getElementById('span_show_itenContact_' + jidTo )
                 
                 spanShow.parentNode.removeChild(spanShow);
@@ -1185 +1188 @@
                                 var group               = arguments[1];
                                 var element             = arguments[2];
-                                var index               = arguments[3];
                                 var showOffline = loadscript.getShowContactsOffline();
                                 
@@ -1193 +1195 @@
                                 var statusColor         = "black";
                                 var statusDisplay       = "none";
+                                
+                                var _resource   = "";
                                 
                                 // Set Presence 
@@ -1237 +1241 @@
                                                                 statusColor     = "orange";
                                                                 
-                                                                if ( TrophyIM.controll.notificationNewUsers == 0 ) 
+                                                                if ( TrophyIM.controll.notificationNewUsers == 0 )
                                                                 {
-                                                                        loadscript.teste_new();
+                                                                        loadscript.enabledNotificationNewUsers();
                                                                         TrophyIM.controll.notificationNewUsers++;
                                                                 }
@@ -1262 +1266 @@
                                                                 statusColor     = "orange";     
                                                                 
-                                                                if ( TrophyIM.controll.notificationNewUsers == 0 ) 
+                                                                if ( TrophyIM.controll.notificationNewUsers == 0 )
                                                                 {
-                                                                        loadscript.teste_new();
+                                                                        loadscript.enabledNotificationNewUsers();
                                                                         TrophyIM.controll.notificationNewUsers++;
                                                                 }
@@ -1278 +1282 @@
                                 };
 
-                                var itensJid    = document.getElementById( "itenContact_" + objContact.contact.jid + "_" + index );
+                                var itensJid    = document.getElementById( "itenContact_" + objContact.contact.jid );
 
                                 if( itensJid == null )
@@ -1299 +1303 @@
                                         {
                                                 divDisplay              : "block", 
-                                                id                              : 'itenContact_' + objContact.contact.jid + '_' + index ,
-                                                index                   : ((index == 0 ) ? "0" : index),
+                                                id                              : 'itenContact_' + objContact.contact.jid ,
                                                 jid                             : objContact.contact.jid,
                                                 nameContact     : nameContact,
@@ -1308 +1311 @@
                                                 status                  : status,
                                                 statusColor             : "black",
-                                                subscription    : objContact.contact.subscription
+                                                subscription    : objContact.contact.subscription,
+                                                resource                : _resource
                                         }
                                         
@@ -1343 +1347 @@
                                         _subscription( objContact );
                                         
-                                        with ( document.getElementById('span_show_' + 'itenContact_' + objContact.contact.jid + '_' + index ) )
+                                        // Set subscription
+                                        itensJid.setAttribute('subscription', objContact.contact.subscription );
+                                        
+                                        with ( document.getElementById('span_show_' + 'itenContact_' + objContact.contact.jid ) )
                                         {
                                                 if( presence == "unavailable" && !showOffline )
@@ -1361 +1368 @@
                                         
                                         if( presence == "unavailable" && !showOffline )
+                                        {
                                                 itensJid.style.display = "none";
+                                        }
                                         else
                                         {
@@ -1376 +1385 @@
                                 if( !objContact.presence && !showOffline )
                                 {
-                                        with ( document.getElementById('span_show_' + 'itenContact_' + objContact.contact.jid + '_' + index ))
+                                        with ( document.getElementById('span_show_' + 'itenContact_' + objContact.contact.jid ))
                                         {
                                                 style.display   = "none";
                                         }
 
-                                        with ( document.getElementById('itenContact_' + objContact.contact.jid + '_' + index ) )
+                                        with ( document.getElementById('itenContact_' + objContact.contact.jid ) )
                                         {
                                                 style.display   = "none";
@@ -1401 +1410 @@
                                                 for( var j = 0; j < groups.length; j++ )
                                                 {
-                                                        addItem( TrophyIM.rosterObj.roster[users[i]], groups[j], element, j );
+                                                        addItem( TrophyIM.rosterObj.roster[users[i]], groups[j], element );
                                                 }
                                         }
                                         else
                                         {
-                                                addItem( TrophyIM.rosterObj.roster[users[i]], "Geral", element, 0 );
+                                                addItem( TrophyIM.rosterObj.roster[users[i]], "Geral", element );
                                         }
                                 }
                                 else
                                 {
-                                        addItem( TrophyIM.rosterObj.roster[users[i]], "Geral", element, 0 );
+                                        addItem( TrophyIM.rosterObj.roster[users[i]], "Geral", element );
                                 }
                         }
@@ -1843 +1852 @@
                 this.addContact(barejid, 'not-in-roster');
             }
+            
             var presence =
                         {
-                resource:resource, priority:priority, show:show, status:status
+                resource        : resource,
+                priority        : priority,
+                show            : show,
+                status          : status
             }
             
@@ -1852 +1865 @@
                 this.roster[jid_lower]['presence'] = {};
             }
+            
             this.roster[jid_lower]['presence'][resource] = presence;
         }