<!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>[30131] trunk/src/wp-admin/js/revisions.js: Revisions modules should not rely on global settings:</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30131">30131</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30131","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-01 00:38:21 +0000 (Sat, 01 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Revisions modules should not rely on global settings:
* Only pass in global settings on `init`, this allows the classes to be used agnostically elsewhere
* Clean up some erroneous/weird Backbone syntax
Props ericlewis, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/30219">#30219</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsrevisionsjs">trunk/src/wp-admin/js/revisions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsrevisionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/revisions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/revisions.js 2014-11-01 00:19:17 UTC (rev 30130)
+++ trunk/src/wp-admin/js/revisions.js 2014-11-01 00:38:21 UTC (rev 30131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,19 +49,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // wp_localize_script transforms top-level numbers into strings. Undo that.
- if ( revisions.settings.to ) {
- revisions.settings.to = parseInt( revisions.settings.to, 10 );
- }
- if ( revisions.settings.from ) {
- revisions.settings.from = parseInt( revisions.settings.from, 10 );
- }
-
- // wp_localize_script does not allow for top-level booleans. Fix that.
- if ( revisions.settings.compareTwoMode ) {
- revisions.settings.compareTwoMode = revisions.settings.compareTwoMode === '1';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * ========================================================================
</span><span class="cx" style="display: block; padding: 0 10px"> * MODELS
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +74,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.frame, 'change:compareTwoMode', this.updateMode );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Listen for internal changes
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenTo( this, 'change:from', this.handleLocalChanges );
- this.listenTo( this, 'change:to', this.handleLocalChanges );
- this.listenTo( this, 'change:compareTwoMode', this.updateSliderSettings );
- this.listenTo( this, 'update:revisions', this.updateSliderSettings );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.on( 'change:from', this.handleLocalChanges );
+ this.on( 'change:to', this.handleLocalChanges );
+ this.on( 'change:compareTwoMode', this.updateSliderSettings );
+ this.on( 'update:revisions', this.updateSliderSettings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Listen for changes to the hovered revision
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenTo( this, 'change:hoveredRevision', this.hoverRevision );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.on( 'change:hoveredRevision', this.hoverRevision );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.set({
</span><span class="cx" style="display: block; padding: 0 10px"> max: this.revisions.length - 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,6 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.bindAll( this, 'getClosestUnloaded' );
</span><span class="cx" style="display: block; padding: 0 10px"> this.loadAll = _.once( this._loadAll );
</span><span class="cx" style="display: block; padding: 0 10px"> this.revisions = options.revisions;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.postId = options.postId;
</ins><span class="cx" style="display: block; padding: 0 10px"> this.requests = {};
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> options.context = this;
</span><span class="cx" style="display: block; padding: 0 10px"> options.data = _.extend( options.data || {}, {
</span><span class="cx" style="display: block; padding: 0 10px"> action: 'get-revision-diffs',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- post_id: revisions.settings.postId
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ post_id: this.postId
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var deferred = wp.ajax.send( options ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,17 +378,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function( attributes, options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var properties = {};
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var state = this.get( 'initialDiffState' );
</ins><span class="cx" style="display: block; padding: 0 10px"> _.bindAll( this, 'receiveDiff' );
</span><span class="cx" style="display: block; padding: 0 10px"> this._debouncedEnsureDiff = _.debounce( this._ensureDiff, 200 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.revisions = options.revisions;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.diffs = new revisions.model.Diffs( [], { revisions: this.revisions });
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set the initial diffs collection provided through the settings
- this.diffs.set( revisions.settings.diffData );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.diffs = new revisions.model.Diffs( [], {
+ revisions: this.revisions,
+ postId: this.get( 'postId' )
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the initial diffs collection.
+ this.diffs.set( this.get( 'diffData' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up internal listeners
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this, 'change:from', this.changeRevisionHandler );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this, 'change:to', this.changeRevisionHandler );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,13 +400,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.diffs, 'ensure:load', this.updateLoadingStatus );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this, 'update:diff', this.updateLoadingStatus );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set the initial revisions, baseUrl, and mode as provided through settings
- properties.to = this.revisions.get( revisions.settings.to );
- properties.from = this.revisions.get( revisions.settings.from );
- properties.compareTwoMode = revisions.settings.compareTwoMode;
- properties.baseUrl = revisions.settings.baseUrl;
- this.set( properties );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the initial revisions, baseUrl, and mode as provided through attributes.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.set( {
+ to : this.revisions.get( state.to ),
+ from : this.revisions.get( state.from ),
+ compareTwoMode : this.revisions.get( state.compareTwoMode )
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start the router if browser supports History API
</span><span class="cx" style="display: block; padding: 0 10px"> if ( window.history && window.history.pushState ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.router = new revisions.Router({ model: this });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1143,15 +1135,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Initialize the revisions UI for revision.php.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> revisions.init = function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var state;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if the current page is not revision.php.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! window.adminpage || 'revision-php' !== window.adminpage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ state = new revisions.model.FrameState({
+ initialDiffState: {
+ // wp_localize_script doesn't stringifies ints, so cast them.
+ to: parseInt( revisions.settings.to, 10 ),
+ from: parseInt( revisions.settings.from, 10 ),
+ // wp_localize_script does not allow for top-level booleans so do a comparator here.
+ compareTwoMode: ( revisions.settings.compareTwoMode === '1' )
+ },
+ diffData: revisions.settings.diffData,
+ baseUrl: revisions.settings.baseUrl,
+ postId: parseInt( revisions.settings.postId, 10 )
+ }, {
+ revisions: new revisions.model.Revisions( revisions.settings.revisionData )
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.frame = new revisions.view.Frame({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- model: new revisions.model.FrameState({}, {
- revisions: new revisions.model.Revisions( revisions.settings.revisionData )
- })
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ model: state
</ins><span class="cx" style="display: block; padding: 0 10px"> }).render();
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>