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

Timestamp:

05/14/10 17:34:49 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Implementado os popups para as janelas de conversa e somente para navegadores Firefox.

File:

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

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -247 +247 @@
         }        
 
-        if (!TrophyIM.statusConn.connected)
+        if ( !TrophyIM.statusConn.connected )
                 {
                         TrophyIM.cookies = TrophyIM.getCookies();
@@ -253 +253 @@
                         //Load other .js scripts needed
                         document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/strophe.min.js'));
-                        //document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/strophe.js'));
                         document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/json2.js')); //Keep this script last
                         
@@ -319 +318 @@
                                 loadscript.rosterDiv();
                                 
-                                if ( loadscript.getUserCurrent() != null )
+                                // Get User Current;
+                                var _getUserCurrent = loadscript.getUserCurrent();
+                                
+                                setTimeout(function()
                                 {
-                                        TrophyIM.login( Base64.decode(loadscript.getUserCurrent().jid), Base64.decode(loadscript.getUserCurrent().password));
-                                }
-                                else
-                                {
-                                        loadscript.loginPage();
-                                }
+                                        if ( _getUserCurrent != null )
+                                                TrophyIM.login( Base64.decode( _getUserCurrent.jid ), Base64.decode( _getUserCurrent.password ));
+                                        else
+                                                loadscript.loginPage();
+                                }, 200);
             }
         }
@@ -384 +385 @@
     login : function()
         {
-                if (TrophyIM.JSONStore.store_working)
+                if ( TrophyIM.JSONStore.store_working )
                 { 
                    //In case they never logged out
@@ -404 +405 @@
                 else
                 {
+                        
                         var barejid             = document.getElementById('trophyimjid').value
                         var fulljid             = barejid + TROPHYIM_RESOURCE;
@@ -414 +416 @@
                         {
                                 button.value = 'disconnect';
-                                TrophyIM.connection.connect(fulljid, password, TrophyIM.onConnect);
-                        }
-                        else
-                        {
-                                button.value = 'connect';
-                                TrophyIM.connection.disconnect();
+                                //TrophyIM.connection.connect( fulljid , password, TrophyIM.onConnect );
+                                
+                                TrophyIM.login( barejid, password );
+                                _winBuild('window_login_page', 'remove');
                         }
                 }