You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by tm...@apache.org on 2006/07/02 13:35:02 UTC
svn commit: r418579 - in /struts/struts2/trunk/core/src/main:
java/org/apache/struts2/components/ java/org/apache/struts2/views/jsp/ui/
resources/template/simple/
Author: tmjee
Date: Sun Jul 2 04:35:00 2006
New Revision: 418579
URL: http://svn.apache.org/viewvc?rev=418579&view=rev
Log:
WW-1366
- added "accesskey" attribute to ui components
Added:
struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java Sun Jul 2 04:35:00 2006
@@ -79,6 +79,8 @@
protected String doubleOnselect;
protected String doubleOnchange;
+ protected String doubleAccesskey;
+
public DoubleListUIBean(OgnlValueStack stack, HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
@@ -247,6 +249,10 @@
if (doubleEmptyOption != null) {
addParameter("doubleEmptyOption", findValue(doubleEmptyOption, Boolean.class));
}
+
+ if (doubleAccesskey != null) {
+ addParameter("doubleAccesskey", findString(doubleAccesskey));
+ }
}
/**
@@ -641,5 +647,13 @@
*/
public void setSize(String size) {
this.size = size;
+ }
+
+ /**
+ * Set the html accesskey attribute.
+ * @a2.tagattribute required="false"
+ */
+ public void setDoubleAccesskey(String doubleAccesskey) {
+ this.doubleAccesskey = doubleAccesskey;
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Sun Jul 2 04:35:00 2006
@@ -584,6 +584,9 @@
protected String onkeyup;
protected String onselect;
protected String onchange;
+
+ // common html attributes
+ protected String accesskey;
// javascript tooltip attribute
protected String tooltip;
@@ -788,6 +791,10 @@
addParameter("onchange", findString(onchange));
}
+ if (accesskey != null) {
+ addParameter("accesskey", findString(accesskey));
+ }
+
if (cssClass != null) {
addParameter("cssClass", findString(cssClass));
}
@@ -1198,6 +1205,14 @@
*/
public void setOnchange(String onchange) {
this.onchange = onchange;
+ }
+
+ /**
+ * Set the html accesskey attribute on rendered html element
+ * @a2.tagattribute required="false"
+ */
+ public void setAccesskey(String accesskey) {
+ this.accesskey = accesskey;
}
/**
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java Sun Jul 2 04:35:00 2006
@@ -62,6 +62,8 @@
protected String doubleOnkeyup;
protected String doubleOnselect;
protected String doubleOnchange;
+
+ protected String doubleAccesskey;
protected void populateParams() {
super.populateParams();
@@ -100,6 +102,8 @@
bean.setDoubleOnselect(doubleOnselect);
bean.setDoubleOnchange(doubleOnchange);
+ bean.setDoubleAccesskey(doubleAccesskey);
+
bean.setEmptyOption(emptyOption);
bean.setHeaderKey(headerKey);
bean.setHeaderValue(headerValue);
@@ -357,5 +361,9 @@
public void setSize(String size) {
this.size = size;
+ }
+
+ public void setDoubleAccesskey(String doubleAccesskey) {
+ this.doubleAccesskey = doubleAccesskey;
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java Sun Jul 2 04:35:00 2006
@@ -54,6 +54,7 @@
protected String onkeyup;
protected String onselect;
protected String onchange;
+ protected String accesskey;
// tooltip attributes
protected String tooltip;
@@ -95,6 +96,7 @@
uiBean.setOnchange(onchange);
uiBean.setTooltip(tooltip);
uiBean.setTooltipConfig(tooltipConfig);
+ uiBean.setAccesskey(accesskey);
}
public void setCssClass(String cssClass) {
@@ -222,5 +224,9 @@
public void setTooltipConfig(String tooltipConfig) {
this.tooltipConfig = tooltipConfig;
+ }
+
+ public void setAccesskey(String accesskey) {
+ this.accesskey = accesskey;
}
}
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl Sun Jul 2 04:35:00 2006
@@ -15,4 +15,5 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl Sun Jul 2 04:35:00 2006
@@ -27,4 +27,5 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl Sun Jul 2 04:35:00 2006
@@ -24,6 +24,7 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+ <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label>
</...@saf.iterator>
Added: struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl?rev=418579&view=auto
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl Sun Jul 2 04:35:00 2006
@@ -0,0 +1,3 @@
+<#if parameters.accesskey?exists>
+ accesskey="${parameters.accesskey?html}"
+</#if>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl Sun Jul 2 04:35:00 2006
@@ -6,4 +6,5 @@
<#if parameters.title?exists> title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl Sun Jul 2 04:35:00 2006
@@ -28,4 +28,5 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl Sun Jul 2 04:35:00 2006
@@ -14,6 +14,7 @@
<#if parameters.for?exists>
for="${parameters.for?html}"<#rt/>
</#if>
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
><#rt/>
<#if parameters.nameValue?exists>
<@saf.property value="parameters.nameValue"/><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl Sun Jul 2 04:35:00 2006
@@ -229,6 +229,9 @@
<#if parameters.doubleOnchange?exists><#t/>
onchange="${parameters.doubleOnchange?html}"
</#if><#t/>
+ <#if parameters.doubleAccesskey?exists><#t/>
+ accesskey="${parameters.doubleAccesskey?html}"
+ </#if>
>
<#if parameters.doubleHeaderKey?exists && parameters.doubleHeaderValue?exists><#t/>
<option value="${parameters.doubleHeaderKey?html}">${parameters.doubleHeaderValue?html}</option>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl Sun Jul 2 04:35:00 2006
@@ -31,4 +31,5 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl Sun Jul 2 04:35:00 2006
@@ -32,6 +32,7 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/><#rt/>
<label for="${parameters.id?html}${itemKey?html}"><#rt/>
${itemValue}<#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl Sun Jul 2 04:35:00 2006
@@ -13,6 +13,7 @@
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
><#if parameters.label?exists><@saf.property value="parameters.label"/><#rt/></#if></button>
<#else>
<input type="reset"<#rt/>
@@ -32,5 +33,6 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl Sun Jul 2 04:35:00 2006
@@ -33,6 +33,7 @@
items="${parameters.items}"
</#if><#t/>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
><#rt/>
<#if parameters.nameValue?exists>
<@saf.property value="parameters.nameValue"/><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Sun Jul 2 04:35:00 2006
@@ -25,6 +25,7 @@
multiple="multiple"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
>
<#if parameters.headerKey?exists && parameters.headerValue?exists>
<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl Sun Jul 2 04:35:00 2006
@@ -16,6 +16,7 @@
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
><#if parameters.label?exists><@saf.property value="parameters.label"/><#rt/></#if></button>
<#else>
<#if parameters.type?exists && parameters.type=="image">
@@ -48,5 +49,6 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl Sun Jul 2 04:35:00 2006
@@ -31,4 +31,5 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl?rev=418579&r1=418578&r2=418579&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl Sun Jul 2 04:35:00 2006
@@ -27,6 +27,7 @@
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
><#rt/>
<#if parameters.nameValue?exists>
<@saf.property value="parameters.nameValue"/><#t/>