Heartbeat: Do not disable the login prompts when the user needs to log in again but has closed the log in modal. Add a 5 minutes timeout before asking them to log in again.
Props dsixinetu, adamsilverstein, azaozz. Fixes #49573. Built from https://develop.svn.wordpress.org/trunk@48337 git-svn-id: http://core.svn.wordpress.org/trunk@48106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
parent
f867b02772
commit
b93b409976
|
|
@ -5,8 +5,10 @@
|
|||
*/
|
||||
|
||||
/* global adminpage */
|
||||
(function($){
|
||||
var wrap;
|
||||
( function( $ ) {
|
||||
var wrap,
|
||||
tempHidden,
|
||||
tempHiddenTimeout;
|
||||
|
||||
/**
|
||||
* Shows the authentication form popup.
|
||||
|
|
@ -15,18 +17,18 @@
|
|||
* @private
|
||||
*/
|
||||
function show() {
|
||||
var parent = $('#wp-auth-check'),
|
||||
form = $('#wp-auth-check-form'),
|
||||
noframe = wrap.find('.wp-auth-fallback-expired'),
|
||||
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.
|
||||
$(window).on( 'beforeunload.wp-auth-check', function(e) {
|
||||
e.originalEvent.returnValue = wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' );
|
||||
$( window ).on( 'beforeunload.wp-auth-check', function( event ) {
|
||||
event.originalEvent.returnValue = window.wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' );
|
||||
});
|
||||
|
||||
frame = $('<iframe id="wp-auth-check-frame" frameborder="0">').attr( 'title', noframe.text() );
|
||||
frame = $( '<iframe id="wp-auth-check-frame" frameborder="0">' ).attr( 'title', noframe.text() );
|
||||
frame.on( 'load', function() {
|
||||
var height, body;
|
||||
|
||||
|
|
@ -35,10 +37,10 @@
|
|||
form.removeClass( 'loading' );
|
||||
|
||||
try {
|
||||
body = $(this).contents().find('body');
|
||||
body = $( this ).contents().find( 'body' );
|
||||
height = body.height();
|
||||
} catch(e) {
|
||||
wrap.addClass('fallback');
|
||||
} catch( er ) {
|
||||
wrap.addClass( 'fallback' );
|
||||
parent.css( 'max-height', '' );
|
||||
form.remove();
|
||||
noframe.focus();
|
||||
|
|
@ -46,25 +48,26 @@
|
|||
}
|
||||
|
||||
if ( height ) {
|
||||
if ( body && body.hasClass('interim-login-success') )
|
||||
if ( body && body.hasClass( 'interim-login-success' ) ) {
|
||||
hide();
|
||||
else
|
||||
} else {
|
||||
parent.css( 'max-height', height + 40 + 'px' );
|
||||
}
|
||||
} else if ( ! body || ! body.length ) {
|
||||
// Catch "silent" iframe origin exceptions in WebKit
|
||||
// after another page is loaded in the iframe.
|
||||
wrap.addClass('fallback');
|
||||
wrap.addClass( 'fallback' );
|
||||
parent.css( 'max-height', '' );
|
||||
form.remove();
|
||||
noframe.focus();
|
||||
}
|
||||
}).attr( 'src', form.data('src') );
|
||||
}).attr( 'src', form.data( 'src' ) );
|
||||
|
||||
form.append( frame );
|
||||
}
|
||||
|
||||
$( 'body' ).addClass( 'modal-open' );
|
||||
wrap.removeClass('hidden');
|
||||
wrap.removeClass( 'hidden' );
|
||||
|
||||
if ( frame ) {
|
||||
frame.focus();
|
||||
|
|
@ -75,7 +78,7 @@
|
|||
*/
|
||||
setTimeout( function() {
|
||||
if ( ! loaded ) {
|
||||
wrap.addClass('fallback');
|
||||
wrap.addClass( 'fallback' );
|
||||
form.remove();
|
||||
noframe.focus();
|
||||
}
|
||||
|
|
@ -92,24 +95,42 @@
|
|||
* @private
|
||||
*/
|
||||
function hide() {
|
||||
$(window).off( 'beforeunload.wp-auth-check' );
|
||||
var adminpage = window.adminpage,
|
||||
wp = window.wp;
|
||||
|
||||
$( 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 ) {
|
||||
|
||||
$(document).off( 'heartbeat-tick.wp-auth-check' );
|
||||
if ( ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && wp && wp.heartbeat ) {
|
||||
wp.heartbeat.connectNow();
|
||||
}
|
||||
|
||||
wrap.fadeOut( 200, function() {
|
||||
wrap.addClass('hidden').css('display', '');
|
||||
$('#wp-auth-check-frame').remove();
|
||||
wrap.addClass( 'hidden' ).css( 'display', '' );
|
||||
$( '#wp-auth-check-frame' ).remove();
|
||||
$( 'body' ).removeClass( 'modal-open' );
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Set or reset the tempHidden variable used to pause showing of the modal
|
||||
* after a user closes it without logging in.
|
||||
*
|
||||
* @since 5.5.0
|
||||
* @private
|
||||
*/
|
||||
function setShowTimeout() {
|
||||
tempHidden = true;
|
||||
window.clearTimeout( tempHiddenTimeout );
|
||||
tempHiddenTimeout = window.setTimeout(
|
||||
function() {
|
||||
tempHidden = false;
|
||||
},
|
||||
300000 // 5 min.
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Binds to the Heartbeat Tick event.
|
||||
*
|
||||
|
|
@ -126,9 +147,9 @@
|
|||
*/
|
||||
$( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
|
||||
if ( 'wp-auth-check' in data ) {
|
||||
if ( ! data['wp-auth-check'] && wrap.hasClass('hidden') ) {
|
||||
if ( ! data['wp-auth-check'] && wrap.hasClass( 'hidden' ) && ! tempHidden ) {
|
||||
show();
|
||||
} else if ( data['wp-auth-check'] && ! wrap.hasClass('hidden') ) {
|
||||
} else if ( data['wp-auth-check'] && ! wrap.hasClass( 'hidden' ) ) {
|
||||
hide();
|
||||
}
|
||||
}
|
||||
|
|
@ -141,9 +162,10 @@
|
|||
*
|
||||
* @since 3.6.0
|
||||
*/
|
||||
wrap = $('#wp-auth-check-wrap');
|
||||
wrap.find('.wp-auth-check-close').on( 'click', function() {
|
||||
wrap = $( '#wp-auth-check-wrap' );
|
||||
wrap.find( '.wp-auth-check-close' ).on( 'click', function() {
|
||||
hide();
|
||||
setShowTimeout();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
/*! This file is auto-generated */
|
||||
!function(h){var s;function i(){h(window).off("beforeunload.wp-auth-check"),"undefined"==typeof adminpage||"post-php"!==adminpage&&"post-new-php"!==adminpage||"undefined"==typeof wp||!wp.heartbeat||(h(document).off("heartbeat-tick.wp-auth-check"),wp.heartbeat.connectNow()),s.fadeOut(200,function(){s.addClass("hidden").css("display",""),h("#wp-auth-check-frame").remove(),h("body").removeClass("modal-open")})}h(document).on("heartbeat-tick.wp-auth-check",function(e,a){"wp-auth-check"in a&&(!a["wp-auth-check"]&&s.hasClass("hidden")?function(){var e,t=h("#wp-auth-check"),n=h("#wp-auth-check-form"),o=s.find(".wp-auth-fallback-expired"),c=!1;n.length&&(h(window).on("beforeunload.wp-auth-check",function(e){e.originalEvent.returnValue=wp.i18n.__("Your session has expired. You can log in again from this page or go to the login page.")}),(e=h('<iframe id="wp-auth-check-frame" frameborder="0">').attr("title",o.text())).on("load",function(){var e,a;c=!0,n.removeClass("loading");try{e=(a=h(this).contents().find("body")).height()}catch(e){return s.addClass("fallback"),t.css("max-height",""),n.remove(),void o.focus()}e?a&&a.hasClass("interim-login-success")?i():t.css("max-height",e+40+"px"):a&&a.length||(s.addClass("fallback"),t.css("max-height",""),n.remove(),o.focus())}).attr("src",n.data("src")),n.append(e)),h("body").addClass("modal-open"),s.removeClass("hidden"),e?(e.focus(),setTimeout(function(){c||(s.addClass("fallback"),n.remove(),o.focus())},1e4)):o.focus()}():a["wp-auth-check"]&&!s.hasClass("hidden")&&i())}).ready(function(){(s=h("#wp-auth-check-wrap")).find(".wp-auth-check-close").on("click",function(){i()})})}(jQuery);
|
||||
!function(i){var s,o,e;function h(){var e=window.adminpage,a=window.wp;i(window).off("beforeunload.wp-auth-check"),("post-php"===e||"post-new-php"===e)&&a&&a.heartbeat&&a.heartbeat.connectNow(),s.fadeOut(200,function(){s.addClass("hidden").css("display",""),i("#wp-auth-check-frame").remove(),i("body").removeClass("modal-open")})}i(document).on("heartbeat-tick.wp-auth-check",function(e,a){"wp-auth-check"in a&&(a["wp-auth-check"]||!s.hasClass("hidden")||o?a["wp-auth-check"]&&!s.hasClass("hidden")&&h():function(){var e,o=i("#wp-auth-check"),n=i("#wp-auth-check-form"),t=s.find(".wp-auth-fallback-expired"),c=!1;n.length&&(i(window).on("beforeunload.wp-auth-check",function(e){e.originalEvent.returnValue=window.wp.i18n.__("Your session has expired. You can log in again from this page or go to the login page.")}),(e=i('<iframe id="wp-auth-check-frame" frameborder="0">').attr("title",t.text())).on("load",function(){var e,a;c=!0,n.removeClass("loading");try{e=(a=i(this).contents().find("body")).height()}catch(e){return s.addClass("fallback"),o.css("max-height",""),n.remove(),void t.focus()}e?a&&a.hasClass("interim-login-success")?h():o.css("max-height",e+40+"px"):a&&a.length||(s.addClass("fallback"),o.css("max-height",""),n.remove(),t.focus())}).attr("src",n.data("src")),n.append(e)),i("body").addClass("modal-open"),s.removeClass("hidden"),e?(e.focus(),setTimeout(function(){c||(s.addClass("fallback"),n.remove(),t.focus())},1e4)):t.focus()}())}).ready(function(){(s=i("#wp-auth-check-wrap")).find(".wp-auth-check-close").on("click",function(){h(),o=!0,window.clearTimeout(e),e=window.setTimeout(function(){o=!1},3e5)})})}(jQuery);
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '5.5-alpha-48336';
|
||||
$wp_version = '5.5-alpha-48337';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue