Author: bpapez
Date: Thu May 24 14:28:04 2007
New Revision: 17378

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17378&repname=
=3Djahia
Log:
REOPENED - issue JAHIA-1699: 4.2: Date picker in date field does not work w=
ith IE7 =

http://www.jahia.net/jira/browse/JAHIA-1699

backport change from jahia 5:
- fix date picker selection bug [JAHIA-1900]

Modified:
    branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/date_field=
.jsp

Modified: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/date=
_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/engines/shared/date_field.jsp&rev=3D17378&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-4-1-BRANCH/src/views/jsp/jahia/engines/shared/date_field=
.jsp (original)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/date_field=
.jsp Thu May 24 14:28:04 2007
@@ -74,8 +74,22 @@
     }
     =

     function onCalendarUpdate<c:out value=3D"${calendarId}"/>(calendar) {
-               document.mainForm.elements["_<c:out 
value=3D"${fieldId}"/>"].value =3D c=
alendar.date.getTime();;        =

-    }    =

+        if (calendar.dateClicked) {
+               document.mainForm.elements["_<c:out value=3D"${fieldId}"/>"].va=
lue =3D calendar.date.getTime();;        =

+        }    =

+    }
+    =

+    function onSelect<c:out value=3D"${calendarId}"/>(calendar, date) {
+        if (calendar.dateClicked) {
+            var input_field =3D document.mainForm.elements["_datebox<c:out=
 value=3D"${fieldId}"/>"];
+                       input_field.value =3D date;
+
+            //update hidden values
+                       setValue<c:out 
value=3D"${calendarId}"/>(input_field.value);
+                       onCalendarUpdate<c:out 
value=3D"${calendarId}"/>(calendar);
+          }
+    }
+        =

 =

     //convert format from Java format
        var dateFormat =3D "<%=3D dateFormat.getPattern() %>";
@@ -101,6 +115,7 @@
         ifFormat        :      dateFormat,
         button          :      "_datebox_trigger<c:out value=3D"${fieldId}"/>",
         singleClick     :      false,
+        onSelect        :    onSelect<c:out value=3D"${calendarId}"/>,    =
    =

         showsTime       :      true
     }
     );

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to