deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for bug #959, maintaining a list of event handlers on the 'events' property was causing problems with elements whom had that ID.

Browse source
This commit is contained in:
John Resig 2007-02-18 22:17:28 +00:00
parent 5616e4c357
commit 3eaebf45a2
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/event/event.js
View file

@ -22,16 +22,16 @@ jQuery.event = {
handler.guid = this.guid++; handler.guid = this.guid++;
// Init the element's event structure // Init the element's event structure
if (!element.events) if (!element.$events)
element.events = {}; element.$events = {};
// Get the current list of functions bound to this event // Get the current list of functions bound to this event
var handlers = element.events[type]; var handlers = element.$events[type];
// If it hasn't been initialized yet // If it hasn't been initialized yet
if (!handlers) { if (!handlers) {
// Init the event handler queue // Init the event handler queue
handlers = element.events[type] = {}; handlers = element.$events[type] = {};
// Remember an existing handler, if it's already there // Remember an existing handler, if it's already there
if (element["on" + type]) if (element["on" + type])
@ -55,17 +55,17 @@ jQuery.event = {
// Detach an event or set of events from an element // Detach an event or set of events from an element
remove: function(element, type, handler) { remove: function(element, type, handler) {
if (element.events) if (element.$events)
if ( type && type.type ) if ( type && type.type )
delete element.events[ type.type ][ type.handler.guid ]; delete element.$events[ type.type ][ type.handler.guid ];
else if (type && element.events[type]) else if (type && element.$events[type])
if ( handler ) if ( handler )
delete element.events[type][handler.guid]; delete element.$events[type][handler.guid];
else else
for ( var i in element.events[type] ) for ( var i in element.$events[type] )
delete element.events[type][i]; delete element.$events[type][i];
else else
for ( var j in element.events ) for ( var j in element.$events )
this.remove( element, j ); this.remove( element, j );
}, },
@ -111,7 +111,7 @@ jQuery.event = {
// returned undefined or false // returned undefined or false
var returnValue; var returnValue;
var c = this.events[event.type]; var c = this.$events[event.type];
var args = [].slice.call( arguments, 1 ); var args = [].slice.call( arguments, 1 );
args.unshift( event ); args.unshift( event );