Author: wesleyhales
Date: 2009-03-05 11:56:55 -0500 (Thu, 05 Mar 2009)
New Revision: 12951
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
JBPORTAL-2227 - setTimeout is evil
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js 2009-03-05
16:30:09 UTC (rev 12950)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js 2009-03-05
16:56:55 UTC (rev 12951)
@@ -32,6 +32,15 @@
//namespace login functions and variables
var isModal = true;
+ /**
+ * Delay for a number of milliseconds
+ */
+ function sleep(delay)
+ {
+ var start = new Date().getTime();
+ while (new Date().getTime() < start + delay);
+ }
+
return{
/**
* Gets the current display status of the login box (modal or page) sets global
variable and
@@ -59,7 +68,7 @@
}
catch(e)
{
- //swallow
+ //swallow
}
//give the cancel button back button functionality (hackish) but there is
no other way
//to get returning page
@@ -99,17 +108,20 @@
* @name validate
* @return {void}
*/
- validate : function() {
+ validate : function(delay) {
try
{
-
- if (document.getElementById('j_username').value.length < 1 ||
document.getElementById('j_password').value.length < 1){
- document.getElementById('login-submit').disabled = true;
- document.getElementById('login-submit').className =
'login-button disabled-button';
- }else{
- document.getElementById('login-submit').disabled = false;
- document.getElementById('login-submit').className =
'login-button';
- }
+ //delay for cached browser credentials
+ if (delay != undefined) {
+ sleep(delay);
+ }
+ if (document.getElementById('j_username').value.length < 1 ||
document.getElementById('j_password').value.length < 1) {
+ document.getElementById('login-submit').disabled = true;
+ document.getElementById('login-submit').className =
'login-button disabled-button';
+ } else {
+ document.getElementById('login-submit').disabled = false;
+ document.getElementById('login-submit').className =
'login-button';
+ }
}
catch (e)
{
@@ -119,7 +131,7 @@
highlight : function(id) {
var el = document.getElementById(id);
- if ( el.className != 'highlight' ) {
+ if (el.className != 'highlight') {
el.className = 'highlight';
}
else {
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-05
16:30:09 UTC (rev 12950)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-05
16:56:55 UTC (rev 12951)
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="/portal-core/css/login.css"
type="text/css"/>
</head>
-<body
onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();setTimeout('JBossPortal.login.validate()',10);">
+<body
onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);">
<div class="login-container">
Show replies by date