]> source.dussan.org Git - jquery.git/commitdiff
Focus on the body before running focus test
authorOleg <markelog@gmail.com>
Mon, 30 Sep 2013 16:23:21 +0000 (20:23 +0400)
committerOleg <markelog@gmail.com>
Mon, 30 Sep 2013 16:53:44 +0000 (20:53 +0400)
(cherry picked from commit b2f27632ebaa0f975eb70d531925129cee4014b9)
Conflicts:
test/unit/event.js

test/unit/event.js

index cbbde37a5ee1af40ec8edb4706bc7acdeb2c1731..ce4536363236fe1043d9184ef05eeeb781afc208 100644 (file)
@@ -2567,35 +2567,34 @@ test( "make sure events cloned correctly", 18, function() {
        clone.find("#check1").trigger("change"); // 0 events should fire
 });
 
-// This test fails in some browsers if document does not have focus
-if ( !document.hasFocus || document.hasFocus && document.hasFocus() ) {
-       test( "Check order of focusin/focusout events", 2, function() {
-               var focus, blur,
-                       input = jQuery( "#name" );
+test( "Check order of focusin/focusout events", 2, function() {
+       var focus, blur,
+               input = jQuery( "#name" );
 
-               input.on( "focus", function() {
-                       focus = true;
+       document.body.focus();
 
-               }).on( "focusin", function() {
-                       ok( !focus, "Focusin event should fire before focus does" );
+       input.on( "focus", function() {
+               focus = true;
 
-               }).on( "blur", function() {
-                       blur = true;
+       }).on( "focusin", function() {
+               ok( !focus, "Focusin event should fire before focus does" );
 
-               }).on( "focusout", function() {
-                       ok( !blur, "Focusout event should fire before blur does" );
-               });
+       }).on( "blur", function() {
+               blur = true;
 
-               // gain focus
-               input.trigger( "focus" );
+       }).on( "focusout", function() {
+               ok( !blur, "Focusout event should fire before blur does" );
+       });
 
-               // then lose it
-               jQuery( "#search" ).trigger( "focus" );
+       // gain focus
+       input.trigger( "focus" );
 
-               // cleanup
-               input.off();
-       });
-}
+       // then lose it
+       jQuery( "#search" ).trigger( "focus" );
+
+       // cleanup
+       input.off();
+});
 
 test( "String.prototype.namespace does not cause trigger() to throw (#13360)", function() {
        expect( 1 );