Skip to content
Permalink
Browse files

Fix some messy rebasing issues.

  • Loading branch information...
dmethvin authored and timmywil committed Sep 7, 2011
1 parent 005958b commit 0ccb88d48da3d3b7f1cc7369d948ffd5902c553e
Showing with 24 additions and 28 deletions.
  1. +24 −28 src/event.js
@@ -764,10 +764,6 @@ if ( !jQuery.support.submitBubbles ) {
if ( !jQuery.support.changeBubbles ) {

var getVal = function( elem ) {
var type = elem.type,
val = elem.value;

getVal = function( elem ) {
var type = jQuery.nodeName( elem, "input" ) ? elem.type : "",
val = elem.value;

@@ -810,35 +806,35 @@ if ( !jQuery.support.changeBubbles ) {
},

changeFilters = {
focusout: testChange,
focusout: testChange,

beforedeactivate: testChange,
beforedeactivate: testChange,

click: function( e ) {
var elem = e.target,
name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : "";
click: function( e ) {
var elem = e.target,
name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : "";

if ( type === "radio" || type === "checkbox" || name === "select" ) {
testChange.call( this, e );
}
},
if ( type === "radio" || type === "checkbox" || name === "select" ) {
testChange.call( this, e );
}
},

// Change has to be called before submit
// Keydown will be called before keypress, which is used in submit-event delegation
keydown: function( e ) {
var elem = e.target,
name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : "";

if ( (e.keyCode === 13 && name !== "textarea") ||
(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
type === "select-multiple" ) {
testChange.call( this, e );
}
},
// Change has to be called before submit
// Keydown will be called before keypress, which is used in submit-event delegation
keydown: function( e ) {
var elem = e.target,
name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : "";

if ( (e.keyCode === 13 && name !== "textarea") ||
(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
type === "select-multiple" ) {
testChange.call( this, e );
}
},

// Beforeactivate happens also before the previous element is blurred
// Beforeactivate happens also before the previous element is blurred
// here, you can't trigger a change event, but you can store data
beforeactivate: function( e ) {
var elem = e.target;

0 comments on commit 0ccb88d

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