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 17:02:43 UTC
svn commit: r529633 - in /struts/struts2/trunk/plugins/dojo/src:
main/java/org/apache/struts2/dojo/components/
main/java/org/apache/struts2/dojo/views/jsp/ui/
main/resources/org/apache/struts2/static/dojo/struts/widget/
main/resources/template/ajax/ te...
Author: musachy
Date: Tue Apr 17 08:02:41 2007
New Revision: 529633
URL: http://svn.apache.org/viewvc?view=rev&rev=529633
Log:
WW-1886 Add "resultLimit" attribute to autocompleter tag
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java Tue Apr 17 08:02:41 2007
@@ -147,6 +147,7 @@
protected String afterNotifyTopics;
protected String errorNotifyTopics;
protected String valueNotifyTopics;
+ protected String resultsLimit;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -205,13 +206,13 @@
addParameter("showDownArrow", findValue(showDownArrow, Boolean.class));
else
addParameter("showDownArrow", Boolean.TRUE);
- if(templateCssPath != null)
+ if (templateCssPath != null)
addParameter("templateCssPath", findString(templateCssPath));
- if(iconPath != null)
+ if (iconPath != null)
addParameter("iconPath", findString(iconPath));
- if(dataFieldName != null)
- addParameter("dataFieldName", findString(dataFieldName));
- if(keyName != null)
+ if (dataFieldName != null)
+ addParameter("dataFieldName", findString(dataFieldName));
+ if (keyName != null)
addParameter("keyName", findString(keyName));
else {
keyName = name + "Key";
@@ -229,6 +230,8 @@
addParameter("errorNotifyTopics", findString(errorNotifyTopics));
if (valueNotifyTopics != null)
addParameter("valueNotifyTopics", findString(valueNotifyTopics));
+ if (resultsLimit != null)
+ addParameter("searchLimit", findString(resultsLimit));
}
@Override
@@ -396,5 +399,10 @@
@StrutsTagAttribute(description="Comma delimmited list of topics that will published when a value is selected")
public void setValueNotifyTopics(String valueNotifyTopics) {
this.valueNotifyTopics = valueNotifyTopics;
+ }
+
+ @StrutsTagAttribute(description="Limit how many results are shown as autocompletion options", defaultValue="30")
+ public void setResultsLimit(String resultsLimit) {
+ this.resultsLimit = resultsLimit;
}
}
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java Tue Apr 17 08:02:41 2007
@@ -59,6 +59,7 @@
protected String afterNotifyTopics;
protected String errorNotifyTopics;
protected String valueNotifyTopics;
+ protected String resultsLimit;
public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Autocompleter(stack, req, res);
@@ -92,6 +93,7 @@
autocompleter.setBeforeNotifyTopics(beforeNotifyTopics);
autocompleter.setErrorNotifyTopics(errorNotifyTopics);
autocompleter.setValueNotifyTopics(valueNotifyTopics);
+ autocompleter.setResultsLimit(resultsLimit);
}
public void setAutoComplete(String autoComplete) {
@@ -192,5 +194,9 @@
public void setValueNotifyTopics(String valueNotifyTopics) {
this.valueNotifyTopics = valueNotifyTopics;
+ }
+
+ public void setResultsLimit(String resultsLimit) {
+ this.resultsLimit = resultsLimit;
}
}
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Tue Apr 17 08:02:41 2007
@@ -5,7 +5,7 @@
struts.widget.ComboBoxDataProvider = function(combobox, node){
this.data = [];
- this.searchLimit = 30;
+ this.searchLimit = combobox.searchLimit;
this.searchType = "STARTSTRING"; // may also be "STARTWORD" or "SUBSTRING"
this.caseSensitive = false;
// for caching optimizations
@@ -236,6 +236,10 @@
dataFieldName : "",
keyName: "",
templateCssPath: dojo.uri.dojoUri("struts/ComboBox.css"),
+
+ //how many results are shown
+ 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/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl Tue Apr 17 08:02:41 2007
@@ -104,6 +104,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" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#if parameters.href?exists>
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java Tue Apr 17 08:02:41 2007
@@ -48,6 +48,7 @@
tag.setTemplateCssPath("j");
tag.setDataFieldName("k");
tag.setValueNotifyTopics("l");
+ tag.setResultsLimit("2");
tag.doStartTag();
tag.doEndTag();
@@ -70,6 +71,7 @@
tag.setIconPath("i");
tag.setTemplateCssPath("j");
tag.setValueNotifyTopics("k");
+ tag.setResultsLimit("2");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt Tue Apr 17 08:02:41 2007
@@ -18,4 +18,5 @@
visibleDownArrow="false"
buttonSrc="i"
templateCssPath="j"
- dataFieldName="k"/>
+ dataFieldName="k"
+ searchLimit="2"/>
Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt?view=diff&rev=529633&r1=529632&r2=529633
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt Tue Apr 17 08:02:41 2007
@@ -13,6 +13,7 @@
visibleDownArrow="true"
buttonSrc="i"
templateCssPath="j"
+ searchLimit="2"
>
<option value="d">d</option>
<option value="e">e</option>