library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some messy rebasing issues.

Browse Source
This commit is contained in:
Dave Methvin 2011-09-07 15:41:23 -04:00 committed by timmywil
parent 005958b731
commit 0ccb88d48d
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/event.js
View File

@ -764,10 +764,6 @@ if ( !jQuery.support.submitBubbles ) {
if ( !jQuery.support.changeBubbles ) { if ( !jQuery.support.changeBubbles ) {
var getVal = function( elem ) { var getVal = function( elem ) {
var type = elem.type,
val = elem.value;
getVal = function( elem ) {
var type = jQuery.nodeName( elem, "input" ) ? elem.type : "", var type = jQuery.nodeName( elem, "input" ) ? elem.type : "",
val = elem.value; val = elem.value;
@ -810,35 +806,35 @@ if ( !jQuery.support.changeBubbles ) {
}, },
changeFilters = { changeFilters = {
focusout: testChange, focusout: testChange,
beforedeactivate: testChange, beforedeactivate: testChange,
click: function( e ) { click: function( e ) {
var elem = e.target, var elem = e.target,
name = elem.nodeName.toLowerCase(), name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : ""; type = name === "input"? elem.type : "";
if ( type === "radio" || type === "checkbox" || name === "select" ) { if ( type === "radio" || type === "checkbox" || name === "select" ) {
testChange.call( this, e ); testChange.call( this, e );
} }
}, },
// Change has to be called before submit // Change has to be called before submit
// Keydown will be called before keypress, which is used in submit-event delegation // Keydown will be called before keypress, which is used in submit-event delegation
keydown: function( e ) { keydown: function( e ) {
var elem = e.target, var elem = e.target,
name = elem.nodeName.toLowerCase(), name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : ""; type = name === "input"? elem.type : "";
if ( (e.keyCode === 13 && name !== "textarea") || if ( (e.keyCode === 13 && name !== "textarea") ||
(e.keyCode === 32 && (type === "checkbox" || type === "radio")) || (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
type === "select-multiple" ) { type === "select-multiple" ) {
testChange.call( this, e ); 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 // here, you can't trigger a change event, but you can store data
beforeactivate: function( e ) { beforeactivate: function( e ) {
var elem = e.target; var elem = e.target;