Changeset 2620 for sandbox/jabberit_messenger/trophy_expresso/js

Timestamp:

04/22/10 17:12:12 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Correcao para evitar o excesso de requisicoes, quando o servidor aceita apenas uma.

Location:

sandbox/jabberit_messenger/trophy_expresso/js

Files:

• AddUser.js (modified) (1 diff)
• loadIM.js (modified) (6 diffs)
• trophyim.js (modified) (2 diffs)

sandbox/jabberit_messenger/trophy_expresso/js/AddUser.js

@@ -14 +14 @@
                                 var name                = jidTo.substring(0, jidTo.indexOf('@'));
 
-                                TrophyIM.setAutorization( jidTo, loadIM.getUserCurrent().jid, 'subscribe');
-                                
                                 // Name
                                 if(( name = prompt("Informe um nome para " + name + "!", name )))

sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js

@@ -135 +135 @@
         }
 
+        function clrAllContacts()
+        {
+                getElement("JabberIMRoster").innerHTML = "";
+        }
+        
         function configEvents(pObj, pEvent, pHandler)
         {
@@ -344 +349 @@
                                 timeoutId               = null;
                         });
+                        
+                        configEvents( window, 'onkeypress', function()
+                        { 
+                                clearInterval(timeoutId);
+                                document.title  = oldTitle;
+                                timeoutId               = null;
+                        });
                 }
         }
@@ -355 +367 @@
                         var coord       = arguments[2];
                         var element = getElement('itenContact_' + jid + '_' + index );
-
+                        var action      = ( element.getAttribute("subscription") === "not-in-roster" ) ? "Adicionar" : "Autorizar";     
                         
                         if( showhidden == null )
@@ -361 +373 @@
 
                         var _options = [
-                                                ['Autorizar', 'loadIM.setAutorization(\''+jid+'\',\''+index+'\')'],
-                                                ['Remover', 'loadIM.removeContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Renomear', 'loadIM.renameContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Trocar grupo', 'loadIM.renameGroup(\''+jid+'\',\''+index+'\')'],
+                                                [ action , 'loadIM.setAutorization(\''+jid+'\',\''+index+'\')'],
+                                                ['Remover' , 'loadIM.removeContact(\''+jid+'\',\''+index+'\')'],
+                                                ['Renomear' , 'loadIM.renameContact(\''+jid+'\',\''+index+'\')'],
+                                                ['Trocar grupo' , 'loadIM.renameGroup(\''+jid+'\',\''+index+'\')']
                                                    ];
 
@@ -568 +580 @@
                                                ['Não Disponível', 'xa', '<img src="'+path_jabberit+'templates/default/images/xa.gif" />'],
                                                ['Ocupado', 'dnd', '<img src="'+path_jabberit+'templates/default/images/dnd.gif" />'],
+                                               ['Desconectado', 'unavailable', '<img src="'+path_jabberit+'templates/default/images/unavailable.gif" />'],
                                                ['Mensagem de Status...', 'status', '<img src="'+path_jabberit+'templates/default/images/message_normal.gif" />']                                                
                                           ];
@@ -692 +705 @@
         loadIM.prototype.actionButton           = actionButton;
         loadIM.prototype.addContact                     = addContact;
+        loadIM.prototype.clrAllContacts         = clrAllContacts;
         loadIM.prototype.configEvents           = configEvents;
         loadIM.prototype.getPhotoUser           = getPhotoUser;

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -420 +420 @@
                 if( status == Strophe.Status.CONNFAIL )
                 {
-                        Strophe.info('Strophe failed to connect.');
             TrophyIM.delCookie('trophyim_bosh_xid');
-            TrophyIM.showLogin();
+            TrophyIM.statusConn.connected = false;
         }
                 
                 if( status == Strophe.Status.DISCONNECTING )
                 {
-                        Strophe.info('Strophe is disconnecting.');
+                        TrophyIM.statusConn.connected = false;
         }
                 
                 if( status == Strophe.Status.DISCONNECTED )
                 {
-                        Strophe.info('Strophe is disconnected.');
             TrophyIM.delCookie('trophyim_bosh_xid');
-            TrophyIM.showLogin();
+            
+            TrophyIM.statusConn.connected = false;
+            
+                        setTimeout(function()
+                        {
+                    TrophyIM.showLogin();
+                    
+                    
+                        },10000);
+                        
+            loadIM.clrAllContacts();    
+            
+            loadIM.setStatusJabber("Desconectado","unavailable");
+            
+            delete TrophyIM.rosterObj.roster;
+            delete TrophyIM.rosterObj.groups;
         }
                 
@@ -442 +455 @@
                         TrophyIM.statusConn.connected = true;
             TrophyIM.showClient();
-                        Strophe.info('Strophe is connected.');
         }
     },