Skip to content
Permalink
Browse files

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

…t6398
  • Loading branch information...
jeresig committed Dec 6, 2010
2 parents 0276b9d + 89b771d commit b00ab56160a75c6aa3fdd21807c951ac8098aabc
Showing with 11 additions and 4 deletions.
  1. +1 −1 src/event.js
  2. +10 −3 test/unit/event.js
@@ -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;
@@ -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(){
ok( true, "Custom event run." );
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");

0 comments on commit b00ab56

Please sign in to comment.
You can’t perform that action at this time.