File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ jQuery.event = {
207
207
// Handle triggering of extra function
208
208
if ( extra && jQuery . isFunction ( extra ) ) {
209
209
// call the extra function and tack the current return value on the end for possible inspection
210
- var ret = extra . apply ( elem , data . concat ( val ) ) ;
210
+ ret = extra . apply ( elem , data . concat ( val ) ) ;
211
211
// if anything is returned, give it precedence and have it overwrite the previous value
212
212
if ( ret !== undefined )
213
213
val = ret ;
@@ -314,7 +314,7 @@ jQuery.event = {
314
314
}
315
315
316
316
// Add which for key events
317
- if ( ! event . which && ( event . charCode || event . keyCode ) )
317
+ if ( ! event . which && ( ( event . charCode || event . charCode === 0 ) ? event . charCode : event . keyCode ) )
318
318
event . which = event . charCode || event . keyCode ;
319
319
320
320
// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
@@ -563,7 +563,7 @@ var withinElement = function(event, elem) {
563
563
// Check if mouse(over|out) are still within the same parent element
564
564
var parent = event . relatedTarget ;
565
565
// Traverse up the tree
566
- while ( parent && parent != elem ) try { parent = parent . parentNode } catch ( error ) { parent = elem ; } ;
566
+ while ( parent && parent != elem ) try { parent = parent . parentNode ; } catch ( error ) { parent = elem ; }
567
567
// Return true if we actually just moused on to a sub-element
568
568
return parent == elem ;
569
569
} ;
You can’t perform that action at this time.
0 commit comments