Skip to content

Commit 87d6bce

Browse files
committed
Fixes bug with charCode, bad 'var' and missing semicolon
1 parent 05930c5 commit 87d6bce

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/event.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jQuery.event = {
207207
// Handle triggering of extra function
208208
if ( extra && jQuery.isFunction( extra ) ) {
209209
// 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 ) );
211211
// if anything is returned, give it precedence and have it overwrite the previous value
212212
if (ret !== undefined)
213213
val = ret;
@@ -314,7 +314,7 @@ jQuery.event = {
314314
}
315315

316316
// 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) )
318318
event.which = event.charCode || event.keyCode;
319319

320320
// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
@@ -563,7 +563,7 @@ var withinElement = function(event, elem) {
563563
// Check if mouse(over|out) are still within the same parent element
564564
var parent = event.relatedTarget;
565565
// 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; }
567567
// Return true if we actually just moused on to a sub-element
568568
return parent == elem;
569569
};

0 commit comments

Comments
 (0)