git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f7adb9
)
Update special events to work with the internal event system changes. Also fixes...
author
jeresig
<jeresig@gmail.com>
Fri, 5 Feb 2010 16:02:56 +0000
(11:02 -0500)
committer
jeresig
<jeresig@gmail.com>
Fri, 5 Feb 2010 16:02:56 +0000
(11:02 -0500)
src/event.js
patch
|
blob
|
history
diff --git
a/src/event.js
b/src/event.js
index
f7c69f8
..
821ea0e
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-99,7
+99,7
@@
jQuery.event = {
// Check for a special event handler
// Only use addEventListener/attachEvent if the special
// events handler returns false
// Check for a special event handler
// Only use addEventListener/attachEvent if the special
// events handler returns false
- if ( !special.setup || special.setup.call( elem, data, namespaces ) === false ) {
+ if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
// Bind the global event handler to the element
if ( elem.addEventListener ) {
elem.addEventListener( type, eventHandle, false );
// Bind the global event handler to the element
if ( elem.addEventListener ) {
elem.addEventListener( type, eventHandle, false );
@@
-502,16
+502,16
@@
jQuery.event = {
},
beforeunload: {
},
beforeunload: {
- setup: function( data, namespaces, fn ) {
+ setup: function( data, namespaces, eventHandle ) {
// We only want to do this special case on windows
if ( this.setInterval ) {
// We only want to do this special case on windows
if ( this.setInterval ) {
- this.onbeforeunload = fn;
+ this.onbeforeunload = eventHandle;
}
return false;
},
}
return false;
},
- teardown: function( namespaces, fn ) {
- if ( this.onbeforeunload === fn ) {
+ teardown: function( namespaces, eventHandle ) {
+ if ( this.onbeforeunload === eventHandle ) {
this.onbeforeunload = null;
}
}
this.onbeforeunload = null;
}
}
@@
-653,9
+653,9
@@
jQuery.each({
if ( !jQuery.support.submitBubbles ) {
jQuery.event.special.submit = {
if ( !jQuery.support.submitBubbles ) {
jQuery.event.special.submit = {
- setup: function( data, namespaces, fn ) {
+ setup: function( data, namespaces ) {
if ( this.nodeName.toLowerCase() !== "form" ) {
if ( this.nodeName.toLowerCase() !== "form" ) {
- jQuery.event.add(this, "click.specialSubmit." + fn.guid, function( e ) {
+ jQuery.event.add(this, "click.specialSubmit", function( e ) {
var elem = e.target, type = elem.type;
if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
var elem = e.target, type = elem.type;
if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
@@
-663,7
+663,7
@@
jQuery.event.special.submit = {
}
});
}
});
- jQuery.event.add(this, "keypress.specialSubmit." + fn.guid, function( e ) {
+ jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
var elem = e.target, type = elem.type;
if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
var elem = e.target, type = elem.type;
if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
@@
-676,9
+676,9
@@
jQuery.event.special.submit = {
}
},
}
},
- remove: function( namespaces, fn ) {
- jQuery.event.remove( this, "click.specialSubmit" + (fn ? "."+fn.guid : "") );
- jQuery.event.remove( this, "keypress.specialSubmit" + (fn ? "."+fn.guid : "") );
+ teardown: function( namespaces ) {
+ jQuery.event.remove( this, "click.specialSubmit" );
+ jQuery.event.remove( this, "keypress.specialSubmit" );
}
};
}
};
@@
-766,16
+766,18
@@
jQuery.event.special.change = {
jQuery.data( elem, "_change_data", getVal(elem) );
}
},
jQuery.data( elem, "_change_data", getVal(elem) );
}
},
- setup: function( data, namespaces, fn ) {
+
+ setup: function( data, namespaces ) {
for ( var type in changeFilters ) {
for ( var type in changeFilters ) {
- jQuery.event.add( this, type + ".specialChange." + fn.guid, changeFilters[type] );
+ jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
}
return formElems.test( this.nodeName );
},
}
return formElems.test( this.nodeName );
},
- remove: function( namespaces, fn ) {
+
+ teardown: function( namespaces ) {
for ( var type in changeFilters ) {
for ( var type in changeFilters ) {
- jQuery.event.remove( this, type + ".specialChange" + (fn ? "."+fn.guid : ""), changeFilters[type] );
+ jQuery.event.remove( this, type + ".specialChange", changeFilters[type] );
}
return formElems.test( this.nodeName );
}
return formElems.test( this.nodeName );