summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-11-21 14:52:58 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-11-21 14:52:58 +0000
commit380e31ddb7cbc56d738dd78f176d03e1c94c27a5 (patch)
treeab9a838906ef04a58dfa32c8016e27e9659168c8
parent2967106274622123f92b9b1a99212871d111c0a0 (diff)
Fixed #9642 -- Made the admin calendar/clock popups go away when the users clicks outside them. The previous javascript code did not work on IE. Thanks northtea for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/media/js/admin/DateTimeShortcuts.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
index f57f97e7ee..e3ebd03fb2 100644
--- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
@@ -109,11 +109,11 @@ var DateTimeShortcuts = {
// Show the clock box
clock_box.style.display = 'block';
- addEvent(window, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
+ addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
},
dismissClock: function(num) {
document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
- window.onclick = null;
+ window.document.onclick = null;
},
handleClockQuicklink: function(num, val) {
DateTimeShortcuts.clockInputs[num].value = val;
@@ -224,10 +224,11 @@ var DateTimeShortcuts = {
cal_box.style.top = findPosY(cal_link) - 75 + 'px';
cal_box.style.display = 'block';
- addEvent(window, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
+ addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
},
dismissCalendar: function(num) {
document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none';
+ window.document.onclick = null;
},
drawPrev: function(num) {
DateTimeShortcuts.calendars[num].drawPreviousMonth();