5:08 a.m.
Author: chris.laprun(a)jboss.com
Date: 2009-03-06 06:08:35 -0500 (Fri, 06 Mar 2009)
New Revision: 12955
Modified:
tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js
tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
Log:
- Synchronization with trunk:
+ JBPORTAL-2227 - setTimeout is evil
+ Improved rewording and minor re-formatting of PageParameterPortlet.
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js 2009-03-06 07:56:26
UTC (rev 12954)
+++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js 2009-03-06 11:08:35
UTC (rev 12955)
@@ -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: tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-06
07:56:26 UTC (rev 12954)
+++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-06
11:08:35 UTC (rev 12955)
@@ -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">
Modified:
tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
===================================================================
---
tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2009-03-06
07:56:26 UTC (rev 12954)
+++
tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2009-03-06
11:08:35 UTC (rev 12955)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -24,11 +24,11 @@
import org.jboss.portal.api.node.PortalNode;
import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
import javax.portlet.PortletException;
import javax.portlet.PortletSecurityException;
@@ -64,7 +64,7 @@
PrintWriter writer = resp.getWriter();
//
- for (Enumeration<String> e =
getPortletConfig().getPublicRenderParameterNames();e.hasMoreElements();)
+ for (Enumeration<String> e =
getPortletConfig().getPublicRenderParameterNames(); e.hasMoreElements();)
{
String parameterName = e.nextElement();
@@ -74,9 +74,9 @@
//
writer.println("<div class=\"portlet-font\">Page parameters
can be bound to coordination aliases. Out of the box, the request parameters" +
- " are themselves bound to page parameters. Setting a value below, will
modify the URL by adding a request parameter.<br/>" +
- "This can be particulary intersting to use URL request parameters to set
values usable by a portlet.</div>");
-
+ " are themselves bound to page parameters. Setting a value below, will
modify the URL by adding a request parameter.<br/>" +
+ "This can be particulary interesting to pass values that can then be used
by portlets.</div>");
+
//
writer.println("<form action=\"" + resp.createActionURL() +
"\" method=\"POST\"><table>");
writer.println("<tr><td>Page parameter
name:</td><td><input type=\"text\" name=\"name\"
width=\"36\" value=\"\"/></td></tr>");