Author: knguyen
Date: Mon Nov 19 15:24:18 2007
New Revision: 19220
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19220&repname=
=3Djahia
Log:
- fix date format parsing
- improve date reset
- remember last selected time
Modified:
trunk/core/src/java/org/jahia/data/fields/JahiaDateFieldUtil.java
trunk/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp
trunk/core/src/webapp/jsp/jahia/engines/shared/date_field.jsp
trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.jsp
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaDateFieldUtil.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaDateFieldUtil.java&rev=3D19220&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/data/fields/JahiaDateFieldUtil.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaDateFieldUtil.java Mon N=
ov 19 15:24:18 2007
@@ -210,6 +210,8 @@
&& defaultValue.indexOf("[") !=3D -1) {
format =3D defaultValue.substring(defaultValue.indexOf("[") + =
1,
defaultValue.indexOf("]"));
+ } else if ( !"".equals(defaultValue.trim()) ) {
+ format =3D defaultValue;
}
return format;
} =
Modified: trunk/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/calendar/calendar.jsp&rev=3D19220&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp Mon Nov 1=
9 15:24:18 2007
@@ -80,6 +80,7 @@
=
=
function resetCal<%=3DcalHandler.getIdentifier()%>() {
+ window.calendar =3D'<reset>';
document.getElementById('<%=3DcalHandler.getIdentifier()%>').value =3D=
"";
document.getElementById('<%=3DcalHandler.getIdentifier()+"Timestamp"%>=
').value =3D "";
onCalResetHandler<%=3DcalHandler.getIdentifier()%>();
@@ -100,6 +101,7 @@
=
function onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar) {
document.mainForm.elements['<%=3DcalHandler.getIdentifier()+"Timestamp"=
%>'].value =3D calendar.date.getTime();
+ calendar.params.date =3D calendar.date.getTime();
}
=
function onCalSelect<%=3DcalHandler.getIdentifier()%>(calendar, date) {
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/date_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/date_field.jsp&rev=3D19220&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/date_field.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/date_field.jsp Mon Nov 1=
9 15:24:18 2007
@@ -187,6 +187,7 @@
}
=
function resetDate<%=3DcontextId%>() {
+ window.calendar =3D'<reset>';
document.mainForm.elements["_datebox<%=3DtheField.getID()%>"].valu=
e =3D "";
document.mainForm.elements["_<%=3DtheField.getID()%>"].value =3D "=
";
document.mainForm.elements["_Str<%=3DtheField.getID()%>"].value =
=3D "";
@@ -195,6 +196,7 @@
function onCalendarUpdate<%=3DcontextId%>(calendar) {
if (calendar.dateClicked) {
document.mainForm.elements["_<%=3DtheField.getID()%>"].value =
=3D calendar.date.getTime();
+ calendar.params.date =3D calendar.date.getTime();
}
}
=
Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calen=
dar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/calendar.jsp&rev=3D19220&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.js=
p (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.js=
p Mon Nov 19 15:24:18 2007
@@ -75,6 +75,7 @@
<script type=3D"text/javascript">
<!--
function resetCal<%=3DcalHandler.getIdentifier()%>() {
+ window.calendar =3D'<reset>';
document.forms['<%=3DcalHandler.getFormName()%>'].elements['<%=3DcalHa=
ndler.getIdentifier()%>'].value =3D "";
document.forms['<%=3DcalHandler.getFormName()%>'].elements['<%=3DcalHa=
ndler.getIdentifier()+"Timestamp"%>'].value =3D "";
}
@@ -99,6 +100,7 @@
function onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar) {
if (calendar.dateClicked || calendar.params.electric) {
document.forms['<%=3DcalHandler.getFormName()%>'].elements['<%=3DcalH=
andler.getIdentifier()+"Timestamp"%>'].value =3D calendar.date.getTime();
+ calendar.params.date =3D calendar.date.getTime();
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
