You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/01/07 14:14:03 UTC

svn commit: r493716 - in /struts/struts2/trunk/core/src: main/resources/template/simple/datepicker.ftl test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt

Author: mrdon
Date: Sun Jan  7 05:14:02 2007
New Revision: 493716

URL: http://svn.apache.org/viewvc?view=rev&rev=493716
Log:
Fixing date picker tests and adding dojo import for non-ajax themes
WW-1596

Modified:
    struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=493716&r1=493715&r2=493716
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl Sun Jan  7 05:14:02 2007
@@ -1,3 +1,7 @@
+<script type="text/javascript">
+    dojo.require("dojo.widget.DatePicker");
+</script>
+
 <input type="hidden"
   <#if parameters.nameValue?if_exists != "">
     value="${parameters.nameValue?html}"<#rt/>
@@ -6,7 +10,7 @@
     name="${parameters.name?html}"<#rt/>
     id="struts_${parameters.name?html}"<#rt/>
   </#if>
->
+ />
 <div dojoType="struts:DatePicker"
   <#if parameters.id?if_exists != "">
     id="${parameters.id?html}"<#rt/>

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt?view=diff&rev=493716&r1=493715&r2=493716
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt Sun Jan  7 05:14:02 2007
@@ -3,10 +3,11 @@
     <td><script type="text/javascript">
 	dojo.require("dojo.widget.DatePicker");
 </script>
-<div dojoType="datepicker"
+<input type="hidden" name="h" id="struts_h" />
+<div dojoType="struts:DatePicker"
  id="id"
+ inputId="struts_h"
  lang="i"
- name="h"
  displayWeeks="true"
  adjustWeeks="true"
  startDate="e"