From e2426e68e6aee3cff0683bf1cc6f029bdebec523 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 10 Aug 2005 00:37:56 +0000 Subject: [PATCH] Removed unnecessary code from admin_media/js/admin/add_calendars.js git-svn-id: http://code.djangoproject.com/svn/django/trunk@448 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin_media/js/admin/add_calendars.js | 135 +++++------------- 1 file changed, 36 insertions(+), 99 deletions(-) diff --git a/django/conf/admin_media/js/admin/add_calendars.js b/django/conf/admin_media/js/admin/add_calendars.js index b0e8247f8d..a6d2270fe5 100644 --- a/django/conf/admin_media/js/admin/add_calendars.js +++ b/django/conf/admin_media/js/admin/add_calendars.js @@ -1,52 +1,5 @@ // Finds all and inserts a calendar after them -// quickElement(tagType, parentReference, textInChildNode, [, attribute, attributeValue ...]); -function quickElement() { - var obj = document.createElement(arguments[0]); - if (arguments[2] != '' && arguments[2] != null) { - var textNode = document.createTextNode(arguments[2]); - obj.appendChild(textNode); - } - for (var i = 3; i < arguments.length; i += 2) { - obj.setAttribute(arguments[i], arguments[i+1]); - } - arguments[1].appendChild(obj); - return obj; -} - -// findPosX / findPosY: see http://www.quirksmode.org/js/findpos.html -function findPosX(obj) -{ - var curleft = 0; - if (obj.offsetParent) - { - while (obj.offsetParent) - { - curleft += obj.offsetLeft - obj = obj.offsetParent; - } - } - else if (obj.x) - curleft += obj.x; - return curleft; -} - -function findPosY(obj) -{ - var curtop = 0; - if (obj.offsetParent) - { - while (obj.offsetParent) - { - curtop += obj.offsetTop - obj = obj.offsetParent; - } - } - else if (obj.y) - curtop += obj.y; - return curtop; -} - var AddCal = { cals: [], inps: [], @@ -69,19 +22,19 @@ var AddCal = { // Markup looks like: // - //
- //

- // - // February 2003 - //

- //
- // - //
- //
- // Yesterday | Today | Tomorrow - //
- //

Cancel

- //
+ //
+ //

+ // + // February 2003 + //

+ //
+ // + //
+ //
+ // Yesterday | Today | Tomorrow + //
+ //

Cancel

+ //
var cal_box = document.createElement('div'); cal_box.style.display = 'none'; cal_box.style.position = 'absolute'; @@ -89,55 +42,39 @@ var AddCal = { cal_box.style.top = findPosY(cal_link) - 75 + 'px'; cal_box.className = 'calendarbox module'; cal_box.setAttribute('id', AddCal.divname1 + num); - + // next-prev links var cal_nav = quickElement('div', cal_box, ''); - quickElement('a', cal_nav, '<', 'class', 'calendarnav-previous', 'href', 'javascript:AddCal.drawPrev('+num+');'); - quickElement('a', cal_nav, '>', 'class', 'calendarnav-next', 'href', 'javascript:AddCal.drawNext('+num+');'); + quickElement('a', cal_nav, '<', 'class', 'calendarnav-previous', 'href', 'javascript:AddCal.drawPrev('+num+');'); + quickElement('a', cal_nav, '>', 'class', 'calendarnav-next', 'href', 'javascript:AddCal.drawNext('+num+');'); cal_box.appendChild(cal_nav); - - // main box + + // main box var cal_main = quickElement('div', cal_box, '', 'id', AddCal.divname2 + num); cal_main.className = 'calendar'; document.body.appendChild(cal_box); AddCal.cals[num] = new Calendar(AddCal.divname2 + num, AddCal.handleCallback(num)); AddCal.cals[num].drawCurrent(); - - // calendar shortcuts - var shortcuts = quickElement('div', cal_box, '', 'class', 'calendar-shortcuts'); - quickElement('a', shortcuts, 'Yesterday', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', -1);'); - shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, 'Today', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', 0);'); - shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, 'Tomorrow', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', +1);'); - - // cancel bar - var cancel_p = quickElement('p', cal_box, '', 'class', 'calendar-cancel'); - quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:AddCal.toggle(' + num + ');'); - - + + // calendar shortcuts + var shortcuts = quickElement('div', cal_box, '', 'class', 'calendar-shortcuts'); + quickElement('a', shortcuts, 'Yesterday', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', -1);'); + shortcuts.appendChild(document.createTextNode('\240|\240')); + quickElement('a', shortcuts, 'Today', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', 0);'); + shortcuts.appendChild(document.createTextNode('\240|\240')); + quickElement('a', shortcuts, 'Tomorrow', 'href', 'javascript:AddCal.handleQuickLink(' + num + ', +1);'); + + // cancel bar + var cancel_p = quickElement('p', cal_box, '', 'class', 'calendar-cancel'); + quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:AddCal.toggle(' + num + ');'); + + } } }, toggle: function(num) { var box = document.getElementById(AddCal.divname1+num); box.style.display = (box.style.display == 'none') ? 'block' : 'none'; - /* - if (box.style.display = 'block') { - var x = 0; - var y = 0; - if (!e) var e = window.event; - if (e.pageX || e.pageY) { - x = e.pageX; - y = e.pageY; - } else if (e.clientX || e.clientY) { - x = e.clientX + document.body.scrollLeft; - y = e.clientY + document.body.scrollTop; - } - box.style.left = x; - box.style.top = y; - } - */ }, drawPrev: function(num) { AddCal.cals[num].drawPreviousMonth(); @@ -149,10 +86,10 @@ var AddCal = { return "function(y, m, d) { AddCal.inps["+num+"].value = y+'-'+m+'-'+d; document.getElementById(AddCal.divname1+"+num+").style.display='none';}"; }, handleQuickLink: function(num, offset) { - var d = new Date(); - d.setDate(d.getDate() + offset) - AddCal.inps[num].value = d.getISODate(); - AddCal.toggle(num); + var d = new Date(); + d.setDate(d.getDate() + offset) + AddCal.inps[num].value = d.getISODate(); + AddCal.toggle(num); } } addEvent(window, 'load', AddCal.init);