mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Probably not the optimal solution, but tests pass.
This commit is contained in:
parent
9ebb2fc654
commit
45dfa3b0fc
38
src/event.js
38
src/event.js
@ -405,7 +405,7 @@ jQuery.event = {
|
|||||||
add: function( proxy, data, namespaces ) {
|
add: function( proxy, data, namespaces ) {
|
||||||
jQuery.extend( proxy, data || {} );
|
jQuery.extend( proxy, data || {} );
|
||||||
proxy.guid += data.selector + data.live;
|
proxy.guid += data.selector + data.live;
|
||||||
jQuery.event.add( this, data.live, liveHandler );
|
jQuery.event.add( this, data.live, liveHandler, data );
|
||||||
},
|
},
|
||||||
|
|
||||||
remove: function( namespaces ) {
|
remove: function( namespaces ) {
|
||||||
@ -467,6 +467,7 @@ jQuery.Event.prototype = {
|
|||||||
if ( !e ) {
|
if ( !e ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if preventDefault exists run it on the original event
|
// if preventDefault exists run it on the original event
|
||||||
if ( e.preventDefault ) {
|
if ( e.preventDefault ) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@ -533,6 +534,41 @@ jQuery.each({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
var event = jQuery.event,
|
||||||
|
special = event.special,
|
||||||
|
handle = event.handle;
|
||||||
|
|
||||||
|
special.submit = {
|
||||||
|
setup: function(data, namespaces) {
|
||||||
|
if(data.selector) {
|
||||||
|
event.add(this, 'click.specialSubmit', function(e, eventData) {
|
||||||
|
if(jQuery(e.target).filter(":submit, :image").closest(data.selector).length) {
|
||||||
|
e.type = "submit";
|
||||||
|
return handle.call( this, e, eventData );
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
event.add(this, 'keypress.specialSubmit', function( e, eventData ) {
|
||||||
|
if(jQuery(e.target).filter(":text, :password").closest(data.selector).length) {
|
||||||
|
e.type = "submit";
|
||||||
|
return handle.call( this, e, eventData );
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
remove: function(namespaces) {
|
||||||
|
event.remove(this, 'click.specialSubmit');
|
||||||
|
event.remove(this, 'keypress.specialSubmit');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
})();
|
||||||
|
|
||||||
// Create "bubbling" focus and blur events
|
// Create "bubbling" focus and blur events
|
||||||
jQuery.each({
|
jQuery.each({
|
||||||
focus: "focusin",
|
focus: "focusin",
|
||||||
|
@ -798,6 +798,22 @@ test(".live()/.die()", function() {
|
|||||||
jQuery('span#liveSpan1').die('click');
|
jQuery('span#liveSpan1').die('click');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("live with submit", function() {
|
||||||
|
var count = 0;
|
||||||
|
|
||||||
|
jQuery("#testForm").live("submit", function() {
|
||||||
|
count++;
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
jQuery("#testForm input[name=sub1]")[0].click();
|
||||||
|
jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
|
||||||
|
|
||||||
|
equals(2, count);
|
||||||
|
|
||||||
|
jQuery("#testForm").die("submit");
|
||||||
|
});
|
||||||
|
|
||||||
test("live with focus/blur", function(){
|
test("live with focus/blur", function(){
|
||||||
expect(2);
|
expect(2);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user