<!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>[26549] trunk/src: Heartbeat:</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/26549">26549</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-03 00:44:22 +0000 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Heartbeat:
- Bring back heartbeat.interval().
- Rename wp_disable_heartbeat_suspend() to wp_heartbeat_set_suspension().
- Rename the option for disabling suspension from options.suspend to options.suspension.
Fixes <a href="http://core.trac.wordpress.org/ticket/25073">#25073</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminjsinlineeditpostjs">trunk/src/wp-admin/js/inline-edit-post.js</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpincludesjsheartbeatjs">trunk/src/wp-includes/js/heartbeat.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/misc.php (26548 => 26549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/misc.php 2013-12-03 00:07:49 UTC (rev 26548)
+++ trunk/src/wp-admin/includes/misc.php 2013-12-03 00:44:22 UTC (rev 26549)
</span><span class="lines">@@ -743,13 +743,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.8
</span><span class="cx"> */
</span><del>-function wp_disable_heartbeat_suspend( $settings ) {
</del><ins>+function wp_heartbeat_set_suspension( $settings ) {
</ins><span class="cx"> global $pagenow;
</span><span class="cx">
</span><span class="cx"> if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
</span><del>- $settings['suspend'] = 'disable';
</del><ins>+ $settings['suspension'] = 'disable';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $settings;
</span><span class="cx"> }
</span><del>-add_filter( 'heartbeat_settings', 'wp_disable_heartbeat_suspend' );
</del><ins>+add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
</ins></span></pre></div>
<a id="trunksrcwpadminjsinlineeditpostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/inline-edit-post.js (26548 => 26549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/inline-edit-post.js 2013-12-03 00:07:49 UTC (rev 26548)
+++ trunk/src/wp-admin/js/inline-edit-post.js 2013-12-03 00:44:22 UTC (rev 26549)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> }).ready( function() {
</span><span class="cx"> // Set the heartbeat interval to 15 sec.
</span><span class="cx"> if ( typeof wp !== 'undefined' && wp.heartbeat ) {
</span><del>- wp.heartbeat.setInterval( 15 );
</del><ins>+ wp.heartbeat.interval( 15 );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/post.js (26548 => 26549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/post.js 2013-12-03 00:07:49 UTC (rev 26548)
+++ trunk/src/wp-admin/js/post.js 2013-12-03 00:44:22 UTC (rev 26549)
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx">
</span><span class="cx"> // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled
</span><span class="cx"> if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) {
</span><del>- wp.heartbeat.setInterval( 15 );
</del><ins>+ wp.heartbeat.interval( 15 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // multi-taxonomies
</span></span></pre></div>
<a id="trunksrcwpincludesjsheartbeatjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/heartbeat.js (26548 => 26549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/heartbeat.js 2013-12-03 00:07:49 UTC (rev 26548)
+++ trunk/src/wp-includes/js/heartbeat.js 2013-12-03 00:44:22 UTC (rev 26549)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> settings.screenId = options.screenId || 'front';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( options.suspend === 'disable' ) {
</del><ins>+ if ( options.suspension === 'disable' ) {
</ins><span class="cx"> settings.suspendEnabled = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // Do this last, can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast'
</span><span class="cx"> if ( newInterval ) {
</span><del>- setInterval( newInterval );
</del><ins>+ interval( newInterval );
</ins><span class="cx"> }
</span><span class="cx"> }).fail( function( jqXHR, textStatus, error ) {
</span><span class="cx"> setErrorState( textStatus || 'unknown', jqXHR.status );
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> * @param string ticks Used with speed = 'fast' or 5, how many ticks before the interval reverts back
</span><span class="cx"> * @return int Current interval in seconds
</span><span class="cx"> */
</span><del>- function setInterval( speed, ticks ) {
</del><ins>+ function interval( speed, ticks ) {
</ins><span class="cx"> var interval, oldInerval = settings.tempInterval ? settings.tempInterval : settings.mainInterval;
</span><span class="cx">
</span><span class="cx"> if ( speed ) {
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> hasFocus: hasFocus,
</span><span class="cx"> connectNow: connectNow,
</span><span class="cx"> disableSuspend: disableSuspend,
</span><del>- setInterval: setInterval,
</del><ins>+ interval: interval,
</ins><span class="cx"> hasConnectionError: hasConnectionError,
</span><span class="cx"> enqueue: enqueue,
</span><span class="cx"> dequeue: dequeue,
</span></span></pre>
</div>
</div>
</body>
</html>