<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24655] trunk/wp-includes/js/wp-auth-check.js: Logged out warnings:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24655">24655</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-07-11 00:44:37 +0000 (Thu, 11 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Logged out warnings:
- Close the iframe immediately on successful login.
- Catch iframe origin exceptions in WebKit when there is a server error or another page is loaded in the iframe.
See <a href="http://core.trac.wordpress.org/ticket/23295">#23295</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjswpauthcheckjs">trunk/wp-includes/js/wp-auth-check.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjswpauthcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-auth-check.js (24654 => 24655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-auth-check.js 2013-07-11 00:35:52 UTC (rev 24654)
+++ trunk/wp-includes/js/wp-auth-check.js 2013-07-11 00:44:37 UTC (rev 24655)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> // Interim login dialog
</span><span class="cx"> (function($){
</span><del>- var wrap, check, scheduleTimeout, hideTimeout;
</del><ins>+ var wrap, check, scheduleTimeout;
</ins><span class="cx">
</span><span class="cx"> function show() {
</span><span class="cx"> var parent = $('#wp-auth-check'), form = $('#wp-auth-check-form'), noframe = wrap.find('.wp-auth-fallback-expired'), frame, loaded = false;
</span><span class="lines">@@ -22,20 +22,23 @@
</span><span class="cx"> height = body.height();
</span><span class="cx"> } catch(e) {
</span><span class="cx"> wrap.addClass('fallback');
</span><ins>+ parent.css( 'max-height', '' );
</ins><span class="cx"> form.remove();
</span><span class="cx"> noframe.focus();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( height ) {
</span><del>- if ( body && body.hasClass('interim-login-success') ) {
- height += 35;
- parent.find('.wp-auth-check-close').show();
- wrap.data('logged-in', 1);
- hideTimeout = setTimeout( function() { hide(); }, 3000 );
- }
-
- parent.css( 'max-height', height + 60 + 'px' );
</del><ins>+ if ( body && body.hasClass('interim-login-success') )
+ hide();
+ else
+ parent.css( 'max-height', height + 60 + 'px' );
+ } else if ( ! body || ! body.length ) {
+ // Catch "silent" iframe origin exceptions in WebKit after another page is loaded in the iframe
+ wrap.addClass('fallback');
+ parent.css( 'max-height', '' );
+ form.remove();
+ noframe.focus();
</ins><span class="cx"> }
</span><span class="cx"> }).attr( 'src', form.data('src') );
</span><span class="cx">
</span><span class="lines">@@ -47,14 +50,14 @@
</span><span class="cx"> if ( frame ) {
</span><span class="cx"> frame.focus();
</span><span class="cx"> // WebKit doesn't throw an error if the iframe fails to load because of "X-Frame-Options: DENY" header.
</span><del>- // Wait for 5 sec. and switch to the fallback text.
</del><ins>+ // Wait for 10 sec. and switch to the fallback text.
</ins><span class="cx"> setTimeout( function() {
</span><span class="cx"> if ( ! loaded ) {
</span><span class="cx"> wrap.addClass('fallback');
</span><span class="cx"> form.remove();
</span><span class="cx"> noframe.focus();
</span><span class="cx"> }
</span><del>- }, 5000 );
</del><ins>+ }, 10000 );
</ins><span class="cx"> } else {
</span><span class="cx"> noframe.focus();
</span><span class="cx"> }
</span><span class="lines">@@ -62,7 +65,6 @@
</span><span class="cx">
</span><span class="cx"> function hide() {
</span><span class="cx"> $(window).off( 'beforeunload.wp-auth-check' );
</span><del>- window.clearTimeout( hideTimeout );
</del><span class="cx">
</span><span class="cx"> // When on the Edit Post screen, speed up heartbeat after the user logs in to quickly refresh nonces
</span><span class="cx"> if ( typeof adminpage != 'undefined' && ( adminpage == 'post-php' || adminpage == 'post-new-php' )
</span><span class="lines">@@ -89,12 +91,12 @@
</span><span class="cx">
</span><span class="cx"> if ( data['wp-auth-check'] && wrap.hasClass('hidden') ) {
</span><span class="cx"> show();
</span><del>- } else if ( ! data['wp-auth-check'] && ! wrap.hasClass('hidden') && ! wrap.data('logged-in') ) {
</del><ins>+ } else if ( ! data['wp-auth-check'] && ! wrap.hasClass('hidden') ) {
</ins><span class="cx"> hide();
</span><span class="cx"> }
</span><span class="cx"> }).ready( function() {
</span><span class="cx"> schedule();
</span><del>- wrap = $('#wp-auth-check-wrap').data( 'logged-in', 0 );
</del><ins>+ wrap = $('#wp-auth-check-wrap');
</ins><span class="cx"> wrap.find('.wp-auth-check-close').on( 'click', function(e) {
</span><span class="cx"> hide();
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>