Author: musachy
Date: Sat Mar 24 10:23:45 2007
New Revision: 522057
URL: http://svn.apache.org/viewvc?view=rev&rev=522057
Log:
WW-1778 datetimepicker will now apply the "cssStyle" and "cssClass" to the
input element
Added:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
Added:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js?view=auto&rev=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js
(added)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js
Sat Mar 24 10:23:45 2007
@@ -0,0 +1,23 @@
+dojo.provide("struts.widget.StrutsDatePicker");
+
+dojo.require("dojo.widget.DropdownDatePicker");
+
+dojo.widget.defineWidget(
+ "struts.widget.StrutsDatePicker",
+ dojo.widget.DropdownDatePicker, {
+ widgetType : "StrutsDatePicker",
+
+ postCreate: function() {
+ struts.widget.StrutsDatePicker.superclass.postCreate.apply(this,
arguments);
+
+ //set cssClass
+ if(this.extraArgs.class) {
+ dojo.html.setClass(this.inputNode, this.extraArgs.class);
+ }
+
+ //set cssStyle
+ if(this.extraArgs.style) {
+ dojo.html.setStyleText(this.inputNode, this.extraArgs.style);
+ }
+ },
+});
\ No newline at end of file
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js?view=diff&rev=522057&r1=522056&r2=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTimePicker.js
Sat Mar 24 10:23:45 2007
@@ -1,5 +1,5 @@
//If we use "TimePicker" for the name, Dojo get's confused and breaks
-//TODO remove this file on nect Dojo release
+//TODO remove this file on next Dojo release
dojo.provide("struts.widget.StrutsTimePicker");
@@ -8,7 +8,7 @@
dojo.widget.defineWidget(
"struts.widget.StrutsTimePicker",
dojo.widget.DropdownTimePicker, {
- widgetType : "TimePicker",
+ widgetType : "StrutsTimePicker",
inputName: "",
name: "",
@@ -21,6 +21,17 @@
}
this.inputNode.name = this.name;
+
+ //set cssClass
+ if(this.extraArgs.class) {
+ dojo.html.setClass(this.inputNode, this.extraArgs.class);
+ }
+
+ //set cssStyle
+ if(this.extraArgs.style) {
+ dojo.html.setStyleText(this.inputNode, this.extraArgs.style);
+ }
+
this.valueNode.name = this.inputName;
},
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js?view=diff&rev=522057&r1=522056&r2=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
Sat Mar 24 10:23:45 2007
@@ -3,6 +3,7 @@
"struts.widget.BindDiv",
"struts.widget.BindAnchor",
"struts.widget.ComboBox",
- "struts.widget.StrutsTimePicker"]
+ "struts.widget.StrutsTimePicker",
+ "struts.widget.StrutsDatePicker"]
});
dojo.provide("struts.widget.*");
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl?view=diff&rev=522057&r1=522056&r2=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
Sat Mar 24 10:23:45 2007
@@ -1,10 +1,7 @@
-<script type="text/javascript">
- dojo.require("dojo.widget.DatePicker");
-</script>
<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
<div
<#if parameters.type?if_exists == "date">
- dojoType="dropdowndatepicker"<#rt/>
+ dojoType="struts:StrutsDatePicker"<#rt/>
<#else>
dojoType="struts:StrutsTimePicker"<#rt/>
</#if>
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js?view=diff&rev=522057&r1=522056&r2=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
Sat Mar 24 10:23:45 2007
@@ -10,5 +10,6 @@
dojo.require("struts.widget.BindAnchor");
dojo.require("struts.widget.ComboBox");
dojo.require("struts.widget.StrutsTimePicker")
+dojo.require("struts.widget.StrutsDatePicker")
dojo.require("dojo.widget.Editor2");
dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger
to work with the includes
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt?view=diff&rev=522057&r1=522056&r2=522057
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
Sat Mar 24 10:23:45 2007
@@ -1,8 +1,4 @@
-<script type="text/javascript">
- dojo.require("dojo.widget.DatePicker");
-</script>
-
-<div dojoType="dropdowndatepicker"
+<div dojoType="struts:StrutsDatePicker"
id="id"
lang="i"
name="dojo.h"
