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

Merge branch 't6398' of https://github.com/jitter/jquery into jitter-t6398

Browse source
This commit is contained in:
John Resig 2010-12-06 17:19:30 -05:00
parent 0276b9de7e 89b771daef
commit b00ab56160
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/event.js
View file

@ -716,7 +716,7 @@ if ( !jQuery.support.submitBubbles ) {
jQuery.event.special.submit = {
setup: function( data, namespaces ) {
if ( this.nodeName.toLowerCase() !== "form" ) {
if ( this.nodeName && this.nodeName.toLowerCase() !== "form" ) {
jQuery.event.add(this, "click.specialSubmit", function( e ) {
var elem = e.target,
type = elem.type;

11
test/unit/event.js
View file

@ -493,7 +493,7 @@ test("bind(name, false), unbind(name, false)", function() {
});
test("bind()/trigger()/unbind() on plain object", function() {
expect( 7 );
expect( 8 );
var obj = {};
@ -503,8 +503,13 @@ test("bind()/trigger()/unbind() on plain object", function() {
// Make sure it doesn't complain when no events are found
jQuery(obj).unbind("test");
jQuery(obj).bind("test", function(){
jQuery(obj).bind({
test: function() {
ok( true, "Custom event run." );
},
submit: function() {
ok( true, "Custom submit event run." );
}
});
var events = jQuery(obj).data("__events__");
@ -516,8 +521,10 @@ test("bind()/trigger()/unbind() on plain object", function() {
// Should trigger 1
jQuery(obj).trigger("test");
jQuery(obj).trigger("submit");
jQuery(obj).unbind("test");
jQuery(obj).unbind("submit");
// Should trigger 0
jQuery(obj).trigger("test");