]> source.dussan.org Git - jquery.git/commitdiff
Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777
authorjeresig <jeresig@gmail.com>
Mon, 11 Apr 2011 16:13:04 +0000 (12:13 -0400)
committerjeresig <jeresig@gmail.com>
Mon, 11 Apr 2011 16:13:04 +0000 (12:13 -0400)
Conflicts:
src/event.js

1  2 
src/event.js
test/unit/event.js

diff --cc src/event.js
index 249e81ff6c267820de37b0a6a892181195557191,6fac59c746e830b6abcf41115efd4ed0c3295e33..1d923627998699348e67ee07ce3d30a99c1e388c
@@@ -1033,8 -1027,16 +1033,16 @@@ jQuery.each(["live", "die"], function( 
                        return this;
                }
  
 -              if ( jQuery.isFunction( data ) ) {
 -                      fn = data;
+               if ( name === "die" && !types &&
+                                       origSelector && origSelector[0] === "." ) {
+                       context.unbind( origSelector );
+                       return this;
+               }
 +              if ( data === false || jQuery.isFunction( data ) ) {
 +                      fn = data || returnFalse;
                        data = undefined;
                }
  
Simple merge