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

Use DOM 2 event handlers, do not trigger click on a tags and event.data no longer global

Browse source
This commit is contained in:
Brandon Aaron 2007-04-22 03:16:53 +00:00
parent f63242f068
commit 2ad223aedd
2 changed files with 48 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/event/event.js
View file

@ -14,9 +14,23 @@ jQuery.event = {
element = window; element = window;
// if data is passed, bind to handler // if data is passed, bind to handler
if( data ) if( data != undefined ) {
// Create temporary function pointer to original handler
var fn = handler;
// Create unique handler function, wrapped around original handler
handler = function() {
// Pass arguments and context to original handler
return fn.apply(this, arguments);
};
// Store data in unique handler
handler.data = data; handler.data = data;
// Set the guid of unique handler to the same of original handler, so it can be removed
handler.guid = fn.guid;
}
// Make sure that the function being executed has a unique ID // Make sure that the function being executed has a unique ID
if ( !handler.guid ) if ( !handler.guid )
handler.guid = this.guid++; handler.guid = this.guid++;
@ -28,21 +42,18 @@ jQuery.event = {
// 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 // Init the event handler queue
if (!handlers) { if (!handlers)
// Init the event handler queue
handlers = element.$events[type] = {}; handlers = element.$events[type] = {};
// Remember an existing handler, if it's already there
if (element["on" + type])
handlers[0] = element["on" + type];
}
// Add the function to the element's handler list // Add the function to the element's handler list
handlers[handler.guid] = handler; handlers[handler.guid] = handler;
// And bind the global event handler to the element // And bind the global event handler to the element
element["on" + type] = this.handle; if (element.addEventListener)
element.addEventListener(type, this.handle, false);
else if (element.attachEvent)
element.attachEvent("on" + type, this.handle, false);
// Remember the function in a global list (for triggering) // Remember the function in a global list (for triggering)
if (!this.global[type]) if (!this.global[type])
@ -81,7 +92,11 @@ jQuery.event = {
// remove generic event handler if no more handlers exist // remove generic event handler if no more handlers exist
for ( ret in events[type] ) break; for ( ret in events[type] ) break;
if ( !ret ) { if ( !ret ) {
ret = element["on" + type] = null; ret = null;
if (element.removeEventListener)
element.removeEventListener(type, this.handle, false);
else if (element.detachEvent)
element.detachEvent("on" + type, this.handle, false);
delete events[type]; delete events[type];
} }
} }
@ -105,19 +120,16 @@ jQuery.event = {
// Handle triggering a single element // Handle triggering a single element
else { else {
var handler = element["on" + type ], val, var val, ret, fn = jQuery.isFunction( element[ type ] );
fn = jQuery.isFunction( element[ type ] );
if ( handler ) { // Pass along a fake event
// Pass along a fake event data.unshift( this.fix({ type: type, target: element }) );
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event // Trigger the event
if ( (val = handler.apply( element, data )) !== false ) if ( (val = this.handle.apply( element, data )) !== false )
this.triggered = true; this.triggered = true;
}
if ( fn && val !== false ) if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
element[ type ](); element[ type ]();
this.triggered = false; this.triggered = false;

34
src/event/eventTest.js
View file

@ -1,7 +1,7 @@
module("event"); module("event");
test("bind()", function() { test("bind()", function() {
expect(11); expect(9);
var handler = function(event) { var handler = function(event) {
ok( event.data, "bind() with data, check passed data exists" ); ok( event.data, "bind() with data, check passed data exists" );
@ -18,31 +18,9 @@ test("bind()", function() {
} }
$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]); $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
// events don't work with iframes, see #939
var tmp = document.createElement('iframe');
document.body.appendChild( tmp );
var doc = tmp.contentDocument;
doc.open();
doc.write("<html><body><input type='text'/></body></html>");
doc.close();
var input = doc.getElementsByTagName("input")[0];
input.addEventListener('click', function() {
ok( true, "Event handling via DOM 2 methods" );
}, false);
$(input).bind("click",function() {
ok( true, "Event handling via jQuery's handler" );
});
triggerEvent( input, "click" );
document.body.removeChild( tmp );
var counter = 0; var counter = 0;
function selectOnChange(event) { function selectOnChange(event) {
equals( event.data, counter++, "Event.data is a global event object" ); equals( event.data, counter++, "Event.data is not a global event object" );
} }
$("select").each(function(i){ $("select").each(function(i){
$(this).bind('change', i, selectOnChange); $(this).bind('change', i, selectOnChange);
@ -81,7 +59,8 @@ test("unbind(event)", function() {
el.click(function() { return; }); el.click(function() { return; });
el.unbind('change',function(){ return; }); el.unbind('change',function(){ return; });
ok( el[0].onclick, "Extra handlers weren't accidentally removed." ); for (var ret in el[0].$events['click']) break;
ok( ret, "Extra handlers weren't accidentally removed." );
el.unbind('click'); el.unbind('click');
ok( !el[0].$events, "Removed the events expando after all handlers are unbound." ); ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
@ -104,10 +83,7 @@ test("toggle(Function, Function)", function() {
fn2 = function(e) { count--; }, fn2 = function(e) { count--; },
preventDefault = function(e) { e.preventDefault() }, preventDefault = function(e) { e.preventDefault() },
link = $('#mark'); link = $('#mark');
if ( $.browser.msie || $.browser.opera || /konquerer/i.test(navigator.userAgent) ) link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
ok( false, "click() on link gets executed in IE/Opera/Konquerer, not intended behaviour!" );
else
link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
ok( count == 1, "Check for toggle(fn, fn)" ); ok( count == 1, "Check for toggle(fn, fn)" );
var first = 0; var first = 0;