<!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>[24622] trunk/wp-admin/js/revisions.js: Don't call `updateDiff()` in the Revisions FrameState model.</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/24622">24622</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-10 03:20:58 +0000 (Wed, 10 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't call `updateDiff()` in the Revisions FrameState model.
* Stuff needs to hook in, so firing it early results in a half-rendered screen.
* `updateDiff()` now returns a promise.
* Now, in the frame view's `render()`, it calls `updateDiff()`, relying on its promise.
See <a href="http://core.trac.wordpress.org/ticket/24425">#24425</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (24621 => 24622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-10 03:07:53 UTC (rev 24621)
+++ trunk/wp-admin/js/revisions.js 2013-07-10 03:20:58 UTC (rev 24622)
</span><span class="lines">@@ -259,7 +259,6 @@
</span><span class="cx"> this.listenTo( this, 'change:to', this.changeRevisionHandler );
</span><span class="cx"> this.listenTo( this, 'update:revisions', this.loadSurrounding );
</span><span class="cx"> this.listenTo( this, 'change:compareTwoMode', this.changedMode );
</span><del>- this.updateDiff({ immediate: true });
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> changedMode: function() {
</span><span class="lines">@@ -300,7 +299,7 @@
</span><span class="cx">
</span><span class="cx"> // Check if we're actually changing the diff id.
</span><span class="cx"> if ( this._diffId === diffId )
</span><del>- return;
</del><ins>+ return $.Deferred().fail().promise();
</ins><span class="cx">
</span><span class="cx"> this._diffId = diffId;
</span><span class="cx"> this.trigger( 'update:revisions', from, to );
</span><span class="lines">@@ -309,13 +308,15 @@
</span><span class="cx"> diff = this.diffs.get( diffId );
</span><span class="cx"> if ( diff ) {
</span><span class="cx"> this.trigger( 'update:diff', diff );
</span><del>-
</del><ins>+ return $.Deferred().resolve().promise();
</ins><span class="cx"> // Otherwise, fetch the diff.
</span><span class="cx"> } else {
</span><del>- if ( options.immediate )
- this._ensureDiff();
- else
</del><ins>+ if ( options.immediate ) {
+ return this._ensureDiff();
+ } else {
</ins><span class="cx"> this._debouncedEnsureDiff();
</span><ins>+ return $.Deferred().fail().promise();
+ }
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -326,7 +327,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _ensureDiff: function() {
</span><del>- this.diffs.ensure( this._diffId, this ).done( function( diff ) {
</del><ins>+ return this.diffs.ensure( this._diffId, this ).done( function( diff ) {
</ins><span class="cx"> // Make sure the current diff didn't change while the request was in flight.
</span><span class="cx"> if ( this._diffId === diff.id )
</span><span class="cx"> this.trigger( 'update:diff', diff );
</span><span class="lines">@@ -361,10 +362,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><del>- wp.Backbone.View.prototype.render.apply( this, arguments );
</del><ins>+ this.model.updateDiff({ immediate: true }).done( _.bind( function() {
+ wp.Backbone.View.prototype.render.apply( this, arguments );
</ins><span class="cx">
</span><del>- $('#wpbody-content .wrap').append( this.el );
- this.views.ready();
</del><ins>+ $('#wpbody-content .wrap').append( this.el );
+ this.views.ready();
+ }, this ) );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>