Author: musachy
Date: Tue Mar 6 18:20:44 2007
New Revision: 515424
URL: http://svn.apache.org/viewvc?view=rev&rev=515424
Log:
WW-1607
Generate remote and static autocompleter from the same freemarker template
Fix autocompleter test
Modified:
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-2.txt
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=515424&r1=515423&r2=515424
==============================================================================
---
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 Mar 6 18:20:44 2007
@@ -1,4 +1,9 @@
-<input dojoType="struts:ComboBox"<#rt/>
+<#if parameters.href?exists>
+ <input dojoType="struts:ComboBox"<#rt/>
+ dataUrl="${parameters.href}"<#rt/>
+<#else>
+ <select dojoType="struts:ComboBox"<#rt/>
+</#if>
<#if parameters.id?if_exists != "">
id="${parameters.id?html}"<#rt/>
</#if>
@@ -8,9 +13,6 @@
<#if parameters.cssStyle?if_exists != "">
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.href?if_exists != "">
- dataUrl="${parameters.href}"<#rt/>
-</#if>
<#if parameters.forceValidOption?exists>
forceValidOption="${parameters.forceValidOption?string?html}"<#rt/>
</#if>
@@ -91,6 +93,34 @@
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
+<#if parameters.list?exists>
+ <#if (parameters.headerKey?exists && parameters.headerValue?exists)>
+ <option
value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
+ </#if>
+ <#if parameters.emptyOption?default(false)>
+ <option value=""></option>
+ </#if>
+ <@s.iterator value="parameters.list">
+ <#if parameters.listKey?exists>
+ <#assign tmpListKey = stack.findString(parameters.listKey) />
+ <#else>
+ <#assign tmpListKey = stack.findString('top') />
+ </#if>
+ <#if parameters.listValue?exists>
+ <#assign tmpListValue = stack.findString(parameters.listValue) />
+ <#else>
+ <#assign tmpListValue = stack.findString('top') />
+ </#if>
+ <option value="${tmpListKey?html}"<#rt/>
+ <#if (parameters.nameValue?exists && parameters.nameValue ==
tmpListKey)>
+ selected="selected"<#rt/>
+ </#if>
+ ><#t/>
+ ${tmpListValue?html}<#t/>
+ </option><#lt/>
+ </@s.iterator>
+ </select>
+</#if>
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=515424&r1=515423&r2=515424
==============================================================================
---
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 Mar 6 18:20:44 2007
@@ -60,7 +60,6 @@
tag.setDisabled("false");
tag.setForceValidOption("false");
tag.setList("{'d','e'}");
- tag.setHref("a");
tag.setDropdownWidth("10");
tag.setDropdownHeight("10");
tag.setDelay("100");
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=515424&r1=515423&r2=515424
==============================================================================
---
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 Mar 6 18:20:44 2007
@@ -1,7 +1,6 @@
<select
dojoType="struts:ComboBox"
id="f"
- dataUrl="a"
forceValidOption="false"
searchType="B"
autoComplete="true"
@@ -10,6 +9,7 @@
dropdownHeight="10"
name="f"
keyName="fKey"
+ visibleDownArrow="true"
buttonSrc="i"
templateCssPath="j"
>
