Author: knguyen
Date: Thu Oct 11 10:46:01 2007
New Revision: 18828
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18828&repname=
=3Djahia
Log:
JAHIA-2473: fix time selection in Calendar popup
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar-setup.js
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar.js
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ca=
lendar/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp&rev=3D18828=
&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp Thu Oct 11 10:46:01 2007
@@ -62,10 +62,13 @@
}
}
=
-function onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar) {
- if (calendar.dateClicked) {
- document.getElementById('<%=3DcalHandler.getIdentifier()+"Timestamp"%=
>').value =3D calendar.date.getTime();
+function onUpdateTime<%=3DcalHandler.getIdentifier()%>(calendar, date) {
+ calendar.dateClicked =3D true;
+ onCalSelect<%=3DcalHandler.getIdentifier()%>(calendar, date);
}
+
+function onCalUpdate<%=3DcalHandler.getIdentifier()%>(calendar) {
+ document.mainForm.elements['<%=3DcalHandler.getIdentifier()+"Timestamp"=
%>'].value =3D calendar.date.getTime();
}
=
function onCalSelect<%=3DcalHandler.getIdentifier()%>(calendar, date) {
@@ -142,7 +145,7 @@
button : "<%=3DcalHandler.getIdentifier()%>Trigger",=
// trigger for the calendar (button ID)
align : "TR", // alignment (defaults to "=
Bl")
singleClick : false,
- //onUpdate : onCalUpdate<%=3DcalHandler.getIdentifie=
r()%>,
+ onUpdateTime : onUpdateTime<%=3DcalHandler.getIdentifier()%=
>,
onSelect : onCalSelect<%=3DcalHandler.getIdentifier()%>,
onClose : onCalClose<%=3DcalHandler.getIdentifier()=
%>,
showsTime : true
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.jsp&=
rev=3D18828&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp Thu Oct 11 10:46:01 2007
@@ -66,6 +66,12 @@
}
}
=
+function onUpdateTime<%=3DcalHandler.getIdentifier()%>(calendar, date) {
+ calendar.dateClicked =3D true;
+ onCalSelect<%=3DcalHandler.getIdentifier()%>(calendar, date);
+}
+
+
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();
@@ -132,7 +138,7 @@
button : "<%=3DcalHandler.getIdentifier()%>Trigger",=
// trigger for the calendar (button ID)
align : "TR", // alignment (defaults to "=
Bl")
singleClick : false,
- //onUpdate : onCalUpdate<%=3DcalHandler.getIdentifier()%=
>,
+ onUpdateTime : onUpdateTime<%=3DcalHandler.getIdentifier()%=
>,
onSelect : onCalSelect<%=3DcalHandler.getIdentifier()%>,
showsTime : true
});
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/calendar-setup.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/calendar-setup.=
js&rev=3D18828&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar-setup.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar-setup.js Thu Oct 11 10:46:01 2007
@@ -81,6 +81,7 @@
param_default("onSelect", null);
param_default("onClose", null);
param_default("onUpdate", null);
+ param_default("onUpdateTime", null);
param_default("date", null);
param_default("showsTime", false);
param_default("timeFormat", "24");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/calendar.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/calendar.js&rev=
=3D18828&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/calendar.js Thu Oct 11 10:46:01 2007
@@ -915,6 +915,9 @@
date.setMonth(m);
date.setDate(d);
this.dateClicked =3D false;
+ if ( typeof cal.params.onUpdateTime =3D=3D
"function" ){
+ cal.params.onUpdateTime(cal,
cal.date.print(cal.dateFormat));
+ }
this.callHandler();
};
})();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
