Author: ktlili
Date: Fri Jun 1 11:15:23 2007
New Revision: 17430
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17430&repname=
=3Djahia
Log:
- fix date piker bug in versionning view: don't select date when navigating=
(JAHIA-1971)
Modified:
trunk/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp
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=3D17430&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 Fri Jun =
1 11:15:23 2007
@@ -62,12 +62,23 @@
}
=
function onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar) {
- if (calendar.dateClicked || calendar.params.electric) {
+ if (calendar.dateClicked) {
document.getElementById('<%=3DcalHandler.getIdentifier()+"Timestamp"%=
>').value =3D calendar.date.getTime();
calendar.params.date =3D calendar.date;
}
}
=
+function onCalSelect<%=3DcalHandler.getIdentifier()%>(calendar, date) {
+ if (calendar.dateClicked) {
+ var input_field =3D document.mainForm.elements["<%=3DcalHandler.ge=
tIdentifier()%>"];
+ input_field.value =3D date;
+
+ //update hidden values
+ setCal<%=3DcalHandler.getIdentifier()%>();
+ onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar);
+ }
+} =
+
function onCalClose<%=3DcalHandler.getIdentifier()%>(calendar) {
calendar.hide();
onCalCloseHandler<%=3DcalHandler.getIdentifier()%>(calendar);
@@ -131,7 +142,8 @@
button : "<%=3DcalHandler.getIdentifier()%>Trigger",=
// trigger for the calendar (button ID)
align : "TR", // alignment (defaults to "=
Bl")
singleClick : false,
- onUpdate : onCalUpdate<%=3DcalHandler.getIdentifier(=
)%>,
+ //onUpdate : onCalUpdate<%=3DcalHandler.getIdentifie=
r()%>,
+ onSelect : onCalSelect<%=3DcalHandler.getIdentifier()%>,
onClose : onCalClose<%=3DcalHandler.getIdentifier()=
%>,
showsTime : true
});
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
