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/02/22 03:34:14 UTC

svn commit: r510352 - in /struts/struts2/trunk/core/src/main/resources: org/apache/struts2/static/dojo/struts/widget/ template/ajax/ template/simple/

Author: musachy
Date: Wed Feb 21 18:34:13 2007
New Revision: 510352

URL: http://svn.apache.org/viewvc?view=rev&rev=510352
Log:
WW-1644 DateTimerPicker problems when type="time". Inherit from Dojo's DropDownTimePicker, the name cannot be "TimePicker" or Dojo gets really confused

Added:
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
      - copied unchanged from r510351, struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
Modified:
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
    struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
    struts/struts2/trunk/core/src/main/resources/template/simple/datetimepicker.ftl

Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js?view=diff&rev=510352&r1=510351&r2=510352
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js Wed Feb 21 18:34:13 2007
@@ -3,6 +3,6 @@
 	         "struts.widget.BindDiv",
 	         "struts.widget.BindAnchor",
 	         "struts.widget.ComboBox",
-            "struts.widget.DatePicker"]
+             "struts.widget.StrutsTimePicker"]
 });
 dojo.provide("struts.widget.*");

Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js?view=diff&rev=510352&r1=510351&r2=510352
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js Wed Feb 21 18:34:13 2007
@@ -9,5 +9,6 @@
 dojo.require("struts.widget.BindDiv");
 dojo.require("struts.widget.BindAnchor");
 dojo.require("struts.widget.ComboBox");
+dojo.require("struts.widget.StrutsTimePicker")
 dojo.require("dojo.widget.Editor2");
 dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger to work with the includes

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/datetimepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datetimepicker.ftl?view=diff&rev=510352&r1=510351&r2=510352
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/datetimepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datetimepicker.ftl Wed Feb 21 18:34:13 2007
@@ -5,7 +5,7 @@
    <#if parameters.type?if_exists == "date">
      dojoType="dropdowndatepicker"<#rt/>
    <#else>
-     dojoType="dropdowntimepicker"<#rt/>
+     dojoType="struts:StrutsTimePicker"<#rt/>
   </#if>
   <#if parameters.id?if_exists != "">
     id="${parameters.id?html}"<#rt/>