You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/04/17 16:13:04 UTC
svn commit: r529618 - in /struts/struts2/branches/STRUTS_2_0_X/core/src:
main/java/org/apache/struts2/components/
main/java/org/apache/struts2/views/jsp/ui/
main/resources/org/apache/struts2/static/dojo/struts/widget/
main/resources/template/ajax/ main...
Author: musachy
Date: Tue Apr 17 07:13:03 2007
New Revision: 529618
URL: http://svn.apache.org/viewvc?view=rev&rev=529618
Log:
WW-1886 Add searchLimit attribute to autocompleter tag
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java Tue Apr 17 07:13:03 2007
@@ -109,6 +109,7 @@
protected String iconPath;
protected String keyName;
protected String dataFieldName;
+ protected String searchLimit;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -172,7 +173,7 @@
if(iconPath != null)
addParameter("iconPath", findString(iconPath));
if(dataFieldName != null)
- addParameter("dataFieldName", findString(dataFieldName));
+ addParameter("dataFieldName", findString(dataFieldName));
if(keyName != null)
addParameter("keyName", findString(keyName));
else {
@@ -182,6 +183,8 @@
String keyNameExpr = "%{" + keyName + "}";
addParameter("key", findString(keyNameExpr));
+ if(searchLimit != null)
+ addParameter("searchLimit", findString(searchLimit));
}
protected Object findListValue() {
@@ -293,5 +296,10 @@
@StrutsTagAttribute(description="Name of the field in the returned JSON object that contains the data array", defaultValue="Value specified in 'name'")
public void setDataFieldName(String dataFieldName) {
this.dataFieldName = dataFieldName;
+ }
+
+ @StrutsTagAttribute(description="Limit how many results are shown as autocompletion options", defaultValue="30")
+ public void setSearchLimit(String searchLimit) {
+ this.searchLimit = searchLimit;
}
}
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java Tue Apr 17 07:13:03 2007
@@ -54,6 +54,7 @@
protected String iconPath;
protected String keyName;
protected String dataFieldName;
+ protected String searchLimit;
public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Autocompleter(stack, req, res);
@@ -83,6 +84,7 @@
autocompleter.setIconPath(iconPath);
autocompleter.setKeyName(keyName);
autocompleter.setDataFieldName(dataFieldName);
+ autocompleter.setSearchLimit(searchLimit);
}
public void setAutoComplete(String autoComplete) {
@@ -167,5 +169,9 @@
public void setDataFieldName(String dataFieldName) {
this.dataFieldName = dataFieldName;
+ }
+
+ public void setSearchLimit(String searchLimit) {
+ this.searchLimit = searchLimit;
}
}
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Tue Apr 17 07:13:03 2007
@@ -28,7 +28,8 @@
this.cbox = cbox;
this.formId = cbox.formId;
this.formFilter = cbox.formFilter;
-
+ this.searchLimit = cbox.searchLimit;
+
if(!dojo.string.isBlank(cbox.dataUrl)){
this.getData(cbox.dataUrl);
}else{
@@ -237,6 +238,8 @@
dataFieldName : "" ,
keyName: "",
templateCssPath: dojo.uri.dojoUri("struts/ComboBox.css"),
+
+ searchLimit : 30,
//from Dojo's ComboBox
showResultList: function() {
// Our dear friend IE doesnt take max-height so we need to calculate that on our own every time
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl Tue Apr 17 07:13:03 2007
@@ -89,6 +89,9 @@
<#if parameters.dataFieldName?if_exists != "">
dataFieldName="${parameters.dataFieldName?html}"
</#if>
+<#if parameters.searchLimit?if_exists != "">
+ searchLimit="${parameters.searchLimit?html}"
+</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl Tue Apr 17 07:13:03 2007
@@ -74,6 +74,9 @@
<#if parameters.templateCssPath?if_exists != "">
templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
</#if>
+<#if parameters.searchLimit?if_exists != "">
+ searchLimit="${parameters.searchLimit?html}"
+</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
<#if parameters.list?exists>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html Tue Apr 17 07:13:03 2007
@@ -428,6 +428,14 @@
<td align="left" valign="top">Define required position of required form element (left|right)</td>
</tr>
<tr>
+ <td align="left" valign="top">searchLimit</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">30</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Limit the size of text to be matched agains the avilable options for autocompletion</td>
+ </tr>
+ <tr>
<td align="left" valign="top">searchType</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">stringstart</td>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java Tue Apr 17 07:13:03 2007
@@ -50,6 +50,7 @@
tag.setIconPath("i");
tag.setTemplateCssPath("j");
tag.setDataFieldName("k");
+ tag.setSearchLimit("1");
tag.doStartTag();
tag.doEndTag();
@@ -73,6 +74,7 @@
tag.setName("f");
tag.setIconPath("i");
tag.setTemplateCssPath("j");
+ tag.setSearchLimit("1");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt Tue Apr 17 07:13:03 2007
@@ -17,4 +17,5 @@
visibleDownArrow="false"
buttonSrc="i"
templateCssPath="j"
- dataFieldName="k">
+ dataFieldName="k"
+ searchLimit="1">
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt?view=diff&rev=529618&r1=529617&r2=529618
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt Tue Apr 17 07:13:03 2007
@@ -12,6 +12,7 @@
keyName="fKey"
buttonSrc="i"
templateCssPath="j"
+ searchLimit="1"
>
<option value="d">d</option>
<option value="e">e</option>