svn commit: r522041 - in /struts/struts2/trunk/plugins/dojo/src: main/resources/template/ajax/autocompleter.ftl main/resources/template/ajax/form-close.ftl test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt

[mu...@apache.org]

Author: musachy
Date: Sat Mar 24 08:52:18 2007
New Revision: 522041

URL: http://svn.apache.org/viewvc?view=rev&rev=522041
Log:
WW-1667
* Move script generated on form tag outside the table element
* Make xhtml complient the input generated by the autocompleter tag

Modified:
    struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
    struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
    struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.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=522041&r1=522040&r2=522041
==============================================================================
--- 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 Sat Mar 24 08:52:18 2007
@@ -106,7 +106,11 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->
+<#if parameters.href?exists>
+ />
+<#else>
+ >
+</#if>
 <#if parameters.list?exists>
 	<#if (parameters.headerKey?exists && parameters.headerValue?exists)>
 		<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>

Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl?view=diff&rev=522041&r1=522040&r2=522041
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl Sat Mar 24 08:52:18 2007
@@ -1,4 +1,4 @@
-
+</table>
 <#if (parameters.customOnsubmitEnabled?default(false))>
 <script type="text/javascript">
 <#-- 
@@ -84,6 +84,4 @@
 --><#t/>
 	<#lt/><!-- javascript that is needed for tooltips -->
 	<#lt/><script type="text/javascript">dojo.require("dojo.widget.Tooltip");dojo.require("dojo.fx.html");</script>
-
-</table>
 </form>

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=522041&r1=522040&r2=522041
==============================================================================
--- 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 Sat Mar 24 08:52:18 2007
@@ -18,4 +18,4 @@
  visibleDownArrow="false"
  buttonSrc="i"
  templateCssPath="j"
- dataFieldName="k">
+ dataFieldName="k"/>