You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ni...@apache.org on 2006/02/12 00:25:05 UTC
svn commit: r377085 - in /struts:
el/trunk/src/java/org/apache/strutsel/taglib/html/ el/trunk/src/tld/
taglib/trunk/src/tld/
Author: niallp
Date: Sat Feb 11 15:25:01 2006
New Revision: 377085
URL: http://svn.apache.org/viewcvs?rev=377085&view=rev
Log:
Fix Bug 37527 for EL and Nested tags - text and textarea are missing the onselect attribute - reported by tdeverdiere
Modified:
struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTagBeanInfo.java
struts/el/trunk/src/tld/struts-html-el.tld
struts/taglib/trunk/src/tld/struts-nested.tld
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTag.java?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTag.java Sat Feb 11 15:25:01 2006
@@ -183,6 +183,12 @@
private String onmouseupExpr;
/**
+ * Instance variable mapped to "onselect" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
+ */
+ private String onselectExpr;
+
+ /**
* Instance variable mapped to "property" tag attribute. (Mapping set in
* associated BeanInfo class.)
*/
@@ -443,6 +449,14 @@
}
/**
+ * Getter method for "onselect" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public String getOnselectExpr() {
+ return (onselectExpr);
+ }
+
+ /**
* Getter method for "property" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -723,6 +737,14 @@
}
/**
+ * Setter method for "onselect" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public void setOnselectExpr(String onselectExpr) {
+ this.onselectExpr = onselectExpr;
+ }
+
+ /**
* Setter method for "property" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -832,6 +854,7 @@
setOnmouseoutExpr(null);
setOnmouseoverExpr(null);
setOnmouseupExpr(null);
+ setOnselectExpr(null);
setPropertyExpr(null);
setReadonlyExpr(null);
setStyleExpr(null);
@@ -1012,6 +1035,12 @@
EvalHelper.evalString("onmouseup", getOnmouseupExpr(), this,
pageContext)) != null) {
setOnmouseup(string);
+ }
+
+ if ((string =
+ EvalHelper.evalString("onselect", getOnselectExpr(), this,
+ pageContext)) != null) {
+ setOnselect(string);
}
if ((string =
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTagBeanInfo.java?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextTagBeanInfo.java Sat Feb 11 15:25:01 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -185,6 +185,12 @@
try {
proplist.add(new PropertyDescriptor("onmouseup", ELTextTag.class,
null, "setOnmouseupExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ try {
+ proplist.add(new PropertyDescriptor("onselect", ELTextTag.class,
+ null, "setOnselectExpr"));
} catch (IntrospectionException ex) {
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTag.java?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTag.java Sat Feb 11 15:25:01 2006
@@ -184,6 +184,12 @@
private String onmouseupExpr;
/**
+ * Instance variable mapped to "onselect" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
+ */
+ private String onselectExpr;
+
+ /**
* Instance variable mapped to "property" tag attribute. (Mapping set in
* associated BeanInfo class.)
*/
@@ -450,6 +456,14 @@
}
/**
+ * Getter method for "onselect" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public String getOnselectExpr() {
+ return (onselectExpr);
+ }
+
+ /**
* Getter method for "property" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -738,6 +752,14 @@
}
/**
+ * Setter method for "onselect" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public void setOnselectExpr(String onselectExpr) {
+ this.onselectExpr = onselectExpr;
+ }
+
+ /**
* Setter method for "property" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -855,6 +877,7 @@
setOnmouseoutExpr(null);
setOnmouseoverExpr(null);
setOnmouseupExpr(null);
+ setOnselectExpr(null);
setPropertyExpr(null);
setReadonlyExpr(null);
setRowsExpr(null);
@@ -1035,6 +1058,12 @@
EvalHelper.evalString("onmouseup", getOnmouseupExpr(), this,
pageContext)) != null) {
setOnmouseup(string);
+ }
+
+ if ((string =
+ EvalHelper.evalString("onselect", getOnselectExpr(), this,
+ pageContext)) != null) {
+ setOnselect(string);
}
if ((string =
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTagBeanInfo.java?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELTextareaTagBeanInfo.java Sat Feb 11 15:25:01 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -185,6 +185,12 @@
try {
proplist.add(new PropertyDescriptor("onmouseup",
ELTextareaTag.class, null, "setOnmouseupExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ try {
+ proplist.add(new PropertyDescriptor("onselect",
+ ELTextareaTag.class, null, "setOnselectExpr"));
} catch (IntrospectionException ex) {
}
Modified: struts/el/trunk/src/tld/struts-html-el.tld
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/tld/struts-html-el.tld?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/el/trunk/src/tld/struts-html-el.tld (original)
+++ struts/el/trunk/src/tld/struts-html-el.tld Sat Feb 11 15:25:01 2006
@@ -7576,6 +7576,15 @@
</description>
</attribute>
<attribute>
+ <name>onselect</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>
+ JavaScript event handler executed when a
+ when a user selects some text in a text field.
+ </description>
+ </attribute>
+ <attribute>
<name>property</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
@@ -7981,6 +7990,15 @@
JavaScript event handler executed when this element is under
the
mouse pointer and a mouse button is released.
+ </description>
+ </attribute>
+ <attribute>
+ <name>onselect</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>
+ JavaScript event handler executed when a
+ when a user selects some text in a text field.
</description>
</attribute>
<attribute>
Modified: struts/taglib/trunk/src/tld/struts-nested.tld
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/tld/struts-nested.tld?rev=377085&r1=377084&r2=377085&view=diff
==============================================================================
--- struts/taglib/trunk/src/tld/struts-nested.tld (original)
+++ struts/taglib/trunk/src/tld/struts-nested.tld Sat Feb 11 15:25:01 2006
@@ -3547,6 +3547,12 @@
<description/>
</attribute>
<attribute>
+ <name>onselect</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description/>
+ </attribute>
+ <attribute>
<name>property</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
@@ -3796,6 +3802,12 @@
</attribute>
<attribute>
<name>onmouseup</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description/>
+ </attribute>
+ <attribute>
+ <name>onselect</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org