diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-01-12 23:57:45 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-01-12 23:57:45 +0000 |
| commit | 9846fee79400d7248009b07782601a7977df8542 (patch) | |
| tree | aa79f6d7e3451f451f20359b97acc8010fb2e020 | |
| parent | 10ca44ba8daca7258747d5c6bf16e8763a4e6ca6 (diff) | |
[1.2.X] Fixed #11414 -- Made sure the calendar and clock popup windows in the admin don't have a negative vertical position. Thanks uipko for the report and fix.
Backport of [15143] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/media/js/admin/DateTimeShortcuts.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js index 2e43a68674..a4293b305b 100644 --- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js @@ -94,7 +94,7 @@ var DateTimeShortcuts = { openClock: function(num) { var clock_box = document.getElementById(DateTimeShortcuts.clockDivName+num) var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName+num) - + // Recalculate the clockbox position // is it left-to-right or right-to-left layout ? if (getStyle(document.body,'direction')!='rtl') { @@ -107,8 +107,8 @@ var DateTimeShortcuts = { // (it returns as it was left aligned), needs to be fixed. clock_box.style.left = findPosX(clock_link) - 110 + 'px'; } - clock_box.style.top = findPosY(clock_link) - 30 + 'px'; - + clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px'; + // Show the clock box clock_box.style.display = 'block'; addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; }); @@ -224,8 +224,8 @@ var DateTimeShortcuts = { // (it returns as it was left aligned), needs to be fixed. cal_box.style.left = findPosX(cal_link) - 180 + 'px'; } - cal_box.style.top = findPosY(cal_link) - 75 + 'px'; - + cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px'; + cal_box.style.display = 'block'; addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; }); }, |