You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/28 16:05:05 UTC
svn commit: r480078 - in /struts/struts2/trunk/core/src:
main/resources/template/ajax/ main/resources/template/simple/
test/java/org/apache/struts2/views/jsp/ui/
test/resources/org/apache/struts2/views/jsp/ui/
Author: husted
Date: Tue Nov 28 07:05:04 2006
New Revision: 480078
URL: http://svn.apache.org/viewvc?view=rev&rev=480078
Log:
WW-1520 Add missing file from r479854
Added:
struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
Added: struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl?view=auto&rev=480078
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl Tue Nov 28 07:05:04 2006
@@ -0,0 +1,56 @@
+<input dojoType="struts:ComboBox"<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#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>
+<#if parameters.searchType?if_exists != "">
+ searchType="${parameters.searchType}"<#rt/>
+</#if>
+<#if parameters.autoComplete?exists>
+ autoComplete="${parameters.autoComplete?string?html}"<#rt/>
+</#if>
+<#if parameters.searchDelay?exists>
+ searchDelay="${parameters.searchDelay?c}"<#rt/>
+</#if>
+<#if parameters.disabled?exists>
+ disabled="${parameters.disabled?string?html}"<#rt/>
+</#if>
+<#if parameters.dropdownWidth?exists>
+ dropdownWidth="${parameters.dropdownWidth?c}"<#rt/>
+</#if>
+<#if parameters.dropdownHeight?exists>
+ dropdownHeight="${parameters.dropdownHeight?c}"<#rt/>
+</#if>
+<#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+</#if>
+<#if parameters.get("size")?exists>
+ size="${parameters.get("size")?html}"<#rt/>
+</#if>
+<#if parameters.maxlength?exists>
+ maxlength="${parameters.maxlength?string?html}"<#rt/>
+</#if>
+<#if parameters.nameValue?exists>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
+</#if>
+<#if parameters.readonly?default(false)>
+ readonly="readonly"<#rt/>
+</#if>
+<#if parameters.tabindex?exists>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
+<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+>
+
+
Added: struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl?view=auto&rev=480078
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl Tue Nov 28 07:05:04 2006
@@ -0,0 +1,80 @@
+<select dojoType="struts:ComboBox" mode="local"<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+<#if parameters.forceValidOption?exists>
+ forceValidOption="${parameters.forceValidOption?string?html}"<#rt/>
+</#if>
+<#if parameters.searchType?if_exists != "">
+ searchType="${parameters.searchType}"<#rt/>
+</#if>
+<#if parameters.autoComplete?exists>
+ autoComplete="${parameters.autoComplete?string?html}"<#rt/>
+</#if>
+<#if parameters.searchDelay?exists>
+ searchDelay="${parameters.searchDelay?c}"<#rt/>
+</#if>
+<#if parameters.disabled?exists>
+ disabled="${parameters.disabled?string?html}"<#rt/>
+</#if>
+<#if parameters.dropdownWidth?exists>
+ dropdownWidth="${parameters.dropdownWidth?c}"<#rt/>
+</#if>
+<#if parameters.dropdownHeight?exists>
+ dropdownHeight="${parameters.dropdownHeight?c}"<#rt/>
+</#if>
+<#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+</#if>
+<#if parameters.get("size")?exists>
+ size="${parameters.get("size")?html}"<#rt/>
+</#if>
+<#if parameters.maxlength?exists>
+ maxlength="${parameters.maxlength?string?html}"<#rt/>
+</#if>
+<#if parameters.nameValue?exists>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
+</#if>
+<#if parameters.readonly?default(false)>
+ readonly="readonly"<#rt/>
+</#if>
+<#if parameters.tabindex?exists>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#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 == tmpListKey)>
+ selected="selected"<#rt/>
+ </#if>
+ ><#t/>
+ ${tmpListValue?html}<#t/>
+ </option><#lt/>
+ </...@s.iterator>
+</#if>
+</select>
+
Added: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java?view=auto&rev=480078
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java (added)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java Tue Nov 28 07:05:04 2006
@@ -0,0 +1,52 @@
+package org.apache.struts2.views.jsp.ui;
+
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+/**
+ * @see Autocompleter
+ */
+public class AutocompleterTest extends AbstractUITagTest {
+
+ public void testAjax() throws Exception {
+ AutocompleterTag tag = new AutocompleterTag();
+ tag.setPageContext(pageContext);
+ tag.setTheme("ajax");
+ tag.setAutoComplete("true");
+ tag.setDisabled("false");
+ tag.setForceValidOption("false");
+ tag.setHref("a");
+ tag.setDropdownWidth("10");
+ tag.setDropdownHeight("10");
+ tag.setSearchDelay("100");
+ tag.setSearchType("b");
+ tag.setDisabled("c");
+ tag.setName("f");
+ tag.setValue("g");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(AutocompleterTest.class.getResource("Autocompleter-1.txt"));
+ }
+
+ public void testSimple() throws Exception {
+ AutocompleterTag tag = new AutocompleterTag();
+ tag.setPageContext(pageContext);
+ tag.setTheme("simple");
+ tag.setAutoComplete("true");
+ tag.setDisabled("false");
+ tag.setForceValidOption("false");
+ tag.setList("{'d','e'}");
+ tag.setHref("a");
+ tag.setDropdownWidth("10");
+ tag.setDropdownHeight("10");
+ tag.setSearchDelay("100");
+ tag.setSearchType("b");
+ tag.setDisabled("c");
+ tag.setName("f");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(AutocompleterTest.class.getResource("Autocompleter-2.txt"));
+ }
+
+}
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt?view=auto&rev=480078
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt Tue Nov 28 07:05:04 2006
@@ -0,0 +1,12 @@
+<input
+ dojoType="struts:ComboBox"
+ id="f"
+ dataUrl="a"
+ forceValidOption="false"
+ searchType="b"
+ autoComplete="true"
+ searchDelay="100"
+ dropdownWidth="10"
+ dropdownHeight="10"
+ name="f"
+ value="g">
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt?view=auto&rev=480078
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt Tue Nov 28 07:05:04 2006
@@ -0,0 +1,14 @@
+<select
+ dojoType="struts:ComboBox"
+ mode="local"
+ id="f"
+ forceValidOption="false"
+ searchType="b"
+ autoComplete="true"
+ searchDelay="100"
+ dropdownWidth="10"
+ dropdownHeight="10"
+ name="f"value="">
+ <optionvalue="d">d</option>
+ <optionvalue="e">e</option>
+</select>