library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #13393. Avoid IE9 activeElement of death.

Browse Source
This commit is contained in:
Dave Methvin 2013-04-08 21:33:25 -04:00
parent f1ba486ee3
commit 85fc5878b3
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/event.js
View File

@ -11,6 +11,12 @@ function returnFalse() {
return false; return false;
} }
function safeActiveElement() {
try {
return document.activeElement;
} catch ( err ) { }
}
/* /*
* Helper functions for managing events -- not part of the public interface. * Helper functions for managing events -- not part of the public interface.
* Props to Dean Edwards' addEvent library for many of the ideas. * Props to Dean Edwards' addEvent library for many of the ideas.
@ -522,7 +528,7 @@ jQuery.event = {
focus: { focus: {
// Fire native event if possible so blur/focus sequence is correct // Fire native event if possible so blur/focus sequence is correct
trigger: function() { trigger: function() {
if ( this !== document.activeElement && this.focus ) { if ( this !== safeActiveElement() && this.focus ) {
this.focus(); this.focus();
return false; return false;
} }
@ -531,7 +537,7 @@ jQuery.event = {
}, },
blur: { blur: {
trigger: function() { trigger: function() {
if ( this === document.activeElement && this.blur ) { if ( this === safeActiveElement() && this.blur ) {
this.blur(); this.blur();
return false; return false;
} }

16
test/data/event/focusElem.html Normal file
View File

@ -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>

5
test/unit/event.js
View File

@ -2416,6 +2416,11 @@ testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", funct
ok( isOk, "$.when( $.ready ) works" ); 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 // need PHP here to make the incepted IFRAME hang
if ( hasPHP ) { if ( hasPHP ) {
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) { testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) {