You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/11/18 15:29:43 UTC
svn commit: r718614 - in /labs/magma/trunk/website-dojo-datewidget/src/main:
java/org/apache/magma/dojo/InterceptDateFields.aj
resources/org/apache/magma/website/dojo/dateField.js
Author: simoneg
Date: Tue Nov 18 06:29:42 2008
New Revision: 718614
URL: http://svn.apache.org/viewvc?rev=718614&view=rev
Log:
Fixes bugs with dates i18n and dojo i18n cooperation
Modified:
labs/magma/trunk/website-dojo-datewidget/src/main/java/org/apache/magma/dojo/InterceptDateFields.aj
labs/magma/trunk/website-dojo-datewidget/src/main/resources/org/apache/magma/website/dojo/dateField.js
Modified: labs/magma/trunk/website-dojo-datewidget/src/main/java/org/apache/magma/dojo/InterceptDateFields.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-datewidget/src/main/java/org/apache/magma/dojo/InterceptDateFields.aj?rev=718614&r1=718613&r2=718614&view=diff
==============================================================================
--- labs/magma/trunk/website-dojo-datewidget/src/main/java/org/apache/magma/dojo/InterceptDateFields.aj (original)
+++ labs/magma/trunk/website-dojo-datewidget/src/main/java/org/apache/magma/dojo/InterceptDateFields.aj Tue Nov 18 06:29:42 2008
@@ -57,6 +57,9 @@
if (f != null) {
writer.append(f.getPattern());
}
+ writer.append("','");
+ String iso = producer.getBean().handler().getStringValue(prop.getName());
+ writer.append(iso);
writer.append("');\n");
}
writer.append(" }\n");
Modified: labs/magma/trunk/website-dojo-datewidget/src/main/resources/org/apache/magma/website/dojo/dateField.js
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-datewidget/src/main/resources/org/apache/magma/website/dojo/dateField.js?rev=718614&r1=718613&r2=718614&view=diff
==============================================================================
--- labs/magma/trunk/website-dojo-datewidget/src/main/resources/org/apache/magma/website/dojo/dateField.js (original)
+++ labs/magma/trunk/website-dojo-datewidget/src/main/resources/org/apache/magma/website/dojo/dateField.js Tue Nov 18 06:29:42 2008
@@ -1,9 +1,12 @@
dojo.require("dijit.form.DateTextBox");
dojo.require("dojo.parser");
-function setupDateField(id, format) {
- var targetdom = document.getElementById(id);
- var preval = targetdom.value;
+
+function setupDateField(id, format, value) {
+ var targetdom = document.getElementById(id);
+ var form = targetdom.form;
+ var name = targetdom.name;
+ targetdom.value = value;
var consts = { datePattern: format };
if (format.indexOf('yyyy') != -1) {
consts.fullYear = true;
@@ -14,19 +17,18 @@
consts.selector='date';
} else if (format.indexOf('y') == -1 && format.indexOf('M') == -1 && format.indexOf('d') == -1) {
consts.selector='time';
+ } else {
+ consts.selector='dateandtime';
}
- var origConsts = {};
- for (i in consts) {
- origConsts[i] = consts[i];
- }
-
- var dval = dojo.date.locale.parse(targetdom.value, consts);
+ var dval = dojo.date.stamp.fromISOString(value, consts);
var acs = targetdom.offsetWidth;
- var widget = new dijit.form.DateTextBox({constraints: consts, id: id, style: 'width: ' + (acs+16) + 'px', value: dval, name: targetdom.name}, id);
-
- widget.serialize = function(val) {
- return dojo.date.locale.format(val, origConsts);
- }
- widget.setValue(dval);
+ var widget = new dijit.form.DateTextBox({constraints: consts, id: id, value: dval, style: 'width: ' + (acs+36) + 'px', name: targetdom.name}, id);
+ widget.serialize = function(value) {
+ return dojo.date.stamp.toISOString(value, {selector: 'dateandtime'});
+ }
+ var elems = document.getElementsByName(name);
+ if (elems.length > 0) {
+ elems.item(0).value = widget.serialize(dval);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org