Changeset 2791 for sandbox/jabberit_messenger
- Timestamp:
- 05/14/10 17:34:49 (14 years ago)
- Location:
- sandbox/jabberit_messenger/trophy_expresso
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/jabberit_messenger/trophy_expresso/js/jscode/loadIM.js
r2787 r2791 448 448 function loginPage() 449 449 { 450 var paramsLoginPage = 451 { 452 'username' : ((( Base64.decode(getUserCurrent().jid) )) ? Base64.decode(getUserCurrent().jid) : ""), 453 'password' : ((( Base64.decode(getUserCurrent().password) )) ? Base64.decode(getUserCurrent().password) : "") 454 } 455 450 456 var winLoginPage = 451 457 { 452 458 id_window : "window_login_page", 453 459 width : 260, 454 height : 1 50,460 height : 120, 455 461 top : 100, 456 462 left : 400, … … 461 467 title : "Expresso Messenger - Login", 462 468 closeAction : "remove", 463 content : Xtools.parse(Xtools.xml("login_page"), "loginPage.xsl" )469 content : Xtools.parse(Xtools.xml("login_page"), "loginPage.xsl", paramsLoginPage) 464 470 }; 465 471 … … 773 779 } 774 780 775 setTimeout( function(){ _rosterDiv(); }, 5 00 );781 setTimeout( function(){ _rosterDiv(); }, 550 ); 776 782 } 777 783 … … 1055 1061 function setUserCurrent() 1056 1062 { 1057 conn.go('p.ff.data_0', 1058 function(_User) 1059 { 1060 var _user = _User; 1061 1062 conn.go('p.ff.data_1', 1063 function(_pass) 1064 { 1065 _setUserCurrent( _user, _pass ); 1066 }); 1067 }); 1063 if( getUserCurrent() == null ) 1064 { 1065 conn.go('p.ff.data_0', 1066 function(_User) 1067 { 1068 var _user = _User; 1069 1070 conn.go('p.ff.data_1', 1071 function(_pass) 1072 { 1073 _setUserCurrent( _user, _pass ); 1074 }); 1075 }); 1076 } 1068 1077 } 1069 1078 -
sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js
r2787 r2791 247 247 } 248 248 249 if ( !TrophyIM.statusConn.connected)249 if ( !TrophyIM.statusConn.connected ) 250 250 { 251 251 TrophyIM.cookies = TrophyIM.getCookies(); … … 253 253 //Load other .js scripts needed 254 254 document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/strophe.min.js')); 255 //document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/strophe.js'));256 255 document.getElementsByTagName('head')[0].appendChild(DOMObjects.getScript(path_jabberit + 'js/json2.js')); //Keep this script last 257 256 … … 319 318 loadscript.rosterDiv(); 320 319 321 if ( loadscript.getUserCurrent() != null ) 320 // Get User Current; 321 var _getUserCurrent = loadscript.getUserCurrent(); 322 323 setTimeout(function() 322 324 { 323 TrophyIM.login( Base64.decode(loadscript.getUserCurrent().jid), Base64.decode(loadscript.getUserCurrent().password)); 324 } 325 else 326 { 327 loadscript.loginPage(); 328 } 325 if ( _getUserCurrent != null ) 326 TrophyIM.login( Base64.decode( _getUserCurrent.jid ), Base64.decode( _getUserCurrent.password )); 327 else 328 loadscript.loginPage(); 329 }, 200); 329 330 } 330 331 } … … 384 385 login : function() 385 386 { 386 if ( TrophyIM.JSONStore.store_working)387 if ( TrophyIM.JSONStore.store_working ) 387 388 { 388 389 //In case they never logged out … … 404 405 else 405 406 { 407 406 408 var barejid = document.getElementById('trophyimjid').value 407 409 var fulljid = barejid + TROPHYIM_RESOURCE; … … 414 416 { 415 417 button.value = 'disconnect'; 416 TrophyIM.connection.connect(fulljid, password, TrophyIM.onConnect); 417 } 418 else 419 { 420 button.value = 'connect'; 421 TrophyIM.connection.disconnect(); 418 //TrophyIM.connection.connect( fulljid , password, TrophyIM.onConnect ); 419 420 TrophyIM.login( barejid, password ); 421 _winBuild('window_login_page', 'remove'); 422 422 } 423 423 } -
sandbox/jabberit_messenger/trophy_expresso/xsl/loginPage.xsl
r2398 r2791 3 3 <xsl:output method="html" omit-xml-declaration="yes"/> 4 4 5 <xsl:param name="username" /> 6 <xsl:param name="password" /> 7 5 8 <xsl:template match="login_page"> 6 9 7 <div id="trophyimlogin"> 8 9 <form name="cred"> 10 <table border="0"> 11 <tr> 12 <td align="right">JID:</td> 13 <td><input type="text" id="trophyimjid"/></td> 14 </tr> 15 <tr> 16 <td align="right">Password:</td> 17 <td><input type="password" id="trophyimpass"/></td> 18 </tr> 19 <tr> 20 <td colspan="2" align="center"> 21 <input type="button" id="trophyimconnect" value="connect" onclick="TrophyIM.login()"/> 22 </td> 23 </tr> 24 </table> 25 </form> 26 27 </div> 10 <center> 11 <div id="trophyimlogin"> 12 <form name="cred"> 13 <table style="border:0px"> 14 <tr> 15 <td align="right">Usuário:</td> 16 <td><input type="text" id="trophyimjid" value="{$username}" /></td> 17 </tr> 18 <tr> 19 <td align="right">Password:</td> 20 <td><input type="password" id="trophyimpass" value="{$password}" /></td> 21 </tr> 22 </table> 23 <br/> 24 <table> 25 <tr> 26 <td colspan="2" align="center"> 27 <input type="button" id="trophyimconnect" value="connect" onclick="TrophyIM.login()"/> 28 </td> 29 </tr> 30 </table> 31 </form> 32 </div> 33 </center> 28 34 29 35 </xsl:template>
Note: See TracChangeset
for help on using the changeset viewer.