From 26788bd3ec9ff05e671eb2400981438249208059 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 2 Dec 2013 18:46:28 +0000 Subject: [PATCH] Heartbeat: update wp-auth-check to use the new "connectNow()" method after a successful login, see #25073. git-svn-id: https://develop.svn.wordpress.org/trunk@26530 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/wp-auth-check.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/js/wp-auth-check.js b/src/wp-includes/js/wp-auth-check.js index e0c16ca652..e58a27dab9 100644 --- a/src/wp-includes/js/wp-auth-check.js +++ b/src/wp-includes/js/wp-auth-check.js @@ -4,7 +4,10 @@ var wrap, next; function show() { - var parent = $('#wp-auth-check'), form = $('#wp-auth-check-form'), noframe = wrap.find('.wp-auth-fallback-expired'), frame, loaded = false; + var parent = $('#wp-auth-check'), + form = $('#wp-auth-check-form'), + noframe = wrap.find('.wp-auth-fallback-expired'), + frame, loaded = false; if ( form.length ) { // Add unload confirmation to counter (frame-busting) JS redirects @@ -68,10 +71,10 @@ $(window).off( 'beforeunload.wp-auth-check' ); // When on the Edit Post screen, speed up heartbeat after the user logs in to quickly refresh nonces - if ( typeof adminpage != 'undefined' && ( adminpage == 'post-php' || adminpage == 'post-new-php' ) && - typeof wp != 'undefined' && wp.heartbeat ) { + if ( typeof adminpage !== 'undefined' && ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && + typeof wp !== 'undefined' && wp.heartbeat ) { - wp.heartbeat.interval( 'fast', 1 ); + wp.heartbeat.connectNow(); } wrap.fadeOut( 200, function() { @@ -88,14 +91,16 @@ $( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) { if ( 'wp-auth-check' in data ) { schedule(); - if ( ! data['wp-auth-check'] && wrap.hasClass('hidden') ) + if ( ! data['wp-auth-check'] && wrap.hasClass('hidden') ) { show(); - else if ( data['wp-auth-check'] && ! wrap.hasClass('hidden') ) + } else if ( data['wp-auth-check'] && ! wrap.hasClass('hidden') ) { hide(); + } } }).on( 'heartbeat-send.wp-auth-check', function( e, data ) { - if ( ( new Date() ).getTime() > next ) + if ( ( new Date() ).getTime() > next ) { data['wp-auth-check'] = true; + } }).ready( function() { schedule(); wrap = $('#wp-auth-check-wrap');