Commit 4509a1be authored by Andrew Jesaitis's avatar Andrew Jesaitis Committed by Claude Paroz
Browse files

Explicitly removes dismissClock 

Uses the removeEvent function in core.js to remove the function from
the document click event.
Refs #4045.
parent 216580e0

django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ var DateTimeShortcuts = { 
    calendars: [],

    calendarInputs: [],

    clockInputs: [],

    dismissClockFunc: [],

    calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled

    calendarDivName2: 'calendarin',  // name of <div> that contains calendar

    calendarLinkName: 'calendarlink',// name of the link that is used to toggle
@@ -39,6 +40,7 @@ var DateTimeShortcuts = { 
    addClock: function(inp) {

        var num = DateTimeShortcuts.clockInputs.length;

        DateTimeShortcuts.clockInputs[num] = inp;

        DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };



        // Shortcut links (clock icon and "Now" link)

        var shortcuts_span = document.createElement('span');
@@ -118,11 +120,11 @@ var DateTimeShortcuts = { 


        // Show the clock box

        clock_box.style.display = 'block';

        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });

        addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);

    },

    dismissClock: function(num) {

       document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';

       window.document.onclick = null;

       removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);

    },

    handleClockQuicklink: function(num, val) {

       DateTimeShortcuts.clockInputs[num].value = val;