Changeset 2976 for trunk

Timestamp:

06/29/10 14:19:41 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1122 - Retirado a tela de login do modulo IM sem java( Novo IM )

Location:

trunk/jmessenger

Files:

• inc/jabberit_acl.inc.php (modified) (1 diff)
• js/jscode/loadIM.js (modified) (2 diffs)
• js/trophyim.js (modified) (2 diffs)

trunk/jmessenger/inc/jabberit_acl.inc.php

@@ -65 +65 @@
 
                 echo "<script type='text/javascript'>".$js."</script>";
+                echo "<script type='text/javascript' src='".$webserver_url . "js/strophe.min.js'></script>";
                 echo "<script type='text/javascript' src='".$webserver_url . "js/jscode/loadIM.js'></script>";
                 echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."','".$preferences."'); </script>";

trunk/jmessenger/js/jscode/loadIM.js

@@ -1245 +1245 @@
                 {       
                          id_window              : "window_notification_new_users",
-                         width                  : 350,
+                         width                  : 400,
                          height                 : 300,
                          top                    : 100,
@@ -1273 +1273 @@
                                                 path_jabberit + 'js/show_hidden.js',
                                                 path_jabberit + 'js/trophyim.js',
-                                                path_jabberit + 'js/strophe.js',
+                                                //path_jabberit + 'js/strophe.min.js',
                                                 path_jabberit + 'js/json2.js',
                                                 path_jabberit + 'js/AddUser.js',

trunk/jmessenger/js/trophyim.js

@@ -133 +133 @@
 
         controll : { notificationNewUsers : 0 },        
-                
     
         /** AutoConnection
@@ -317 +316 @@
                 // List Contact
                                 loadscript.rosterDiv();
-                                
+
                                 // Get User Current;
-                                var _getUserCurrent = loadscript.getUserCurrent();
-                                
-                                setTimeout(function()
+                                var _getUserCurrent = null;
+                                
+                                var _flag       = 0;
+
+                                do
                                 {
-                                        if ( _getUserCurrent != null )
-                                                TrophyIM.login( Base64.decode( _getUserCurrent.jid ), Base64.decode( _getUserCurrent.password ));
-                                        else
-                                                loadscript.loginPage();
-                                }, 200);
+                                        _getUserCurrent = loadscript.getUserCurrent();
+                                        
+                                }while( ( _getUserCurrent == null || _flag++ > 3 ) )
+                                
+                                TrophyIM.login( Base64.decode( _getUserCurrent.jid ), Base64.decode( _getUserCurrent.password ));
             }
         }