Skip to content
Permalink
Browse files

Fix #13393. Avoid IE9 activeElement of death.

  • Loading branch information...
dmethvin committed Apr 9, 2013
1 parent f1ba486 commit 85fc5878b3c6af73f42d61eedf73013e7faae408
Showing with 29 additions and 2 deletions.
  1. +8 −2 src/event.js
  2. +16 −0 test/data/event/focusElem.html
  3. +5 −0 test/unit/event.js
@@ -11,6 +11,12 @@ function returnFalse() {
return false;
}

function safeActiveElement() {
try {
return document.activeElement;
} catch ( err ) { }
}

/*
* Helper functions for managing events -- not part of the public interface.
* Props to Dean Edwards' addEvent library for many of the ideas.
@@ -522,7 +528,7 @@ jQuery.event = {
focus: {
// Fire native event if possible so blur/focus sequence is correct
trigger: function() {
if ( this !== document.activeElement && this.focus ) {
if ( this !== safeActiveElement() && this.focus ) {
this.focus();
return false;
}
@@ -531,7 +537,7 @@ jQuery.event = {
},
blur: {
trigger: function() {
if ( this === document.activeElement && this.blur ) {
if ( this === safeActiveElement() && this.blur ) {
this.blur();
return false;
}
@@ -0,0 +1,16 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>.focus() (activeElement access #13393)</title>

<script src="../../jquery.js"></script>
</head>
<body>
<a href="#" id="frame-link"></a>
<script>
jQuery("#frame-link").focus();
window.parent.iframeCallback( true );
</script>
</body>
</html>
@@ -2416,6 +2416,11 @@ testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", funct
ok( isOk, "$.when( $.ready ) works" );
});

testIframeWithCallback( "Focusing iframe element", "event/focusElem.html", function( isOk ) {
expect(1);
ok( isOk, "Focused an element in an iframe" );
});

// need PHP here to make the incepted IFRAME hang
if ( hasPHP ) {
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) {

0 comments on commit 85fc587

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