<!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>[47120] trunk/src/js/_enqueues/wp/revisions.js: Docs: Improve comments in `js/_enqueues/wp/revisions.js` per the documentation standards.</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 { white-space: pre-line; 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/47120">47120</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/47120","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-29 00:35:39 +0000 (Wed, 29 Jan 2020)</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'>Docs: Improve comments in `js/_enqueues/wp/revisions.js` per the documentation standards.
Props passoniate.
Fixes <a href="https://core.trac.wordpress.org/ticket/49177">#49177</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswprevisionsjs">trunk/src/js/_enqueues/wp/revisions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswprevisionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/revisions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/revisions.js 2020-01-29 00:33:45 UTC (rev 47119)
+++ trunk/src/js/_enqueues/wp/revisions.js 2020-01-29 00:35:39 UTC (rev 47120)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Link post revisions data served from the back end.
</span><span class="cx" style="display: block; padding: 0 10px"> revisions.settings = window._wpRevisionsSettings || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For debugging
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For debugging.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.debug = false;
</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">@@ -34,7 +34,7 @@
</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">- // Handy functions to help with positioning
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handy functions to help with positioning.
</ins><span class="cx" style="display: block; padding: 0 10px"> $.fn.allOffsets = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var offset = this.offset() || {top: 0, left: 0}, win = $(window);
</span><span class="cx" style="display: block; padding: 0 10px"> return _.extend( offset, {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,17 +71,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.frame = options.frame;
</span><span class="cx" style="display: block; padding: 0 10px"> this.revisions = options.revisions;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Listen for changes to the revisions or mode from outside
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Listen for changes to the revisions or mode from outside.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.frame, 'update:revisions', this.receiveRevisions );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Listen for internal changes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Listen for internal changes.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.on( 'change:from', this.handleLocalChanges );
</span><span class="cx" style="display: block; padding: 0 10px"> this.on( 'change:to', this.handleLocalChanges );
</span><span class="cx" style="display: block; padding: 0 10px"> this.on( 'change:compareTwoMode', this.updateSliderSettings );
</span><span class="cx" style="display: block; padding: 0 10px"> this.on( 'update:revisions', this.updateSliderSettings );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Listen for changes to the hovered revision
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Listen for changes to the hovered revision.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.on( 'change:hoveredRevision', this.hoverRevision );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.set({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.getSliderValue( 'from', 'to' )
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> value: null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- range: true // ensures handles cannot cross
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ range: true // Ensures handles cannot cross.
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.set({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,17 +117,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'update:slider' );
</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">- // Called when a revision is hovered
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Called when a revision is hovered.
</ins><span class="cx" style="display: block; padding: 0 10px"> hoverRevision: function( model, value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'hovered:revision', value );
</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">- // Called when `compareTwoMode` changes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Called when `compareTwoMode` changes.
</ins><span class="cx" style="display: block; padding: 0 10px"> updateMode: function( model, value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.set({ compareTwoMode: value });
</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">- // Called when `from` or `to` changes in the local model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Called when `from` or `to` changes in the local model.
</ins><span class="cx" style="display: block; padding: 0 10px"> handleLocalChanges: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.frame.set({
</span><span class="cx" style="display: block; padding: 0 10px"> from: this.get('from'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,9 +135,9 @@
</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">- // Receives revisions changes from outside the model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Receives revisions changes from outside the model.
</ins><span class="cx" style="display: block; padding: 0 10px"> receiveRevisions: function( from, to ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if nothing changed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if nothing changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.get('from') === from && this.get('to') === to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,8 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defaults: {
</span><span class="cx" style="display: block; padding: 0 10px"> revision: null,
</span><span class="cx" style="display: block; padding: 0 10px"> offset: {},
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- hovering: false, // Whether the mouse is hovering
- scrubbing: false // Whether the mouse is scrubbing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ hovering: false, // Whether the mouse is hovering.
+ scrubbing: false // Whether the mouse is scrubbing.
</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"> initialize: function( options ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,17 +255,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'ensure:load', ids, from, to, deferred.promise() );
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( ids, _.bind( function( id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove anything that has an ongoing request
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove anything that has an ongoing request.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.requests[ id ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete ids[ id ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove anything we already have
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove anything we already have.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.get( id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete ids[ id ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }, this ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! request ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Always include the ID that started this ensure
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always include the ID that started this ensure.
</ins><span class="cx" style="display: block; padding: 0 10px"> ids[ id ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> request = this.load( _.keys( ids ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return deferred.promise();
</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">- // Returns an array of proximal diffs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Returns an array of proximal diffs.
</ins><span class="cx" style="display: block; padding: 0 10px"> getClosestUnloaded: function( ids, centerId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="cx" style="display: block; padding: 0 10px"> return _.chain([0].concat( ids )).initial().zip( ids ).sortBy( function( pair ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }).fail( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === num ) { // Already tried 1. This just isn't working. Give up.
</span><span class="cx" style="display: block; padding: 0 10px"> deferred.reject();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else { // Request fewer diffs this time
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Request fewer diffs this time.
</ins><span class="cx" style="display: block; padding: 0 10px"> self._loadAll( allRevisionIds, centerId, Math.ceil( num / 2 ) ).done( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> deferred.resolve();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> load: function( comparisons ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.revisions.log( 'load', comparisons );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Our collection should only ever grow, never shrink, so remove: false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Our collection should only ever grow, never shrink, so `remove: false`.
</ins><span class="cx" style="display: block; padding: 0 10px"> return this.fetch({ data: { compare: comparisons }, remove: false }).done( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.revisions.log( 'load:complete', comparisons );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the initial diffs collection.
</span><span class="cx" style="display: block; padding: 0 10px"> this.diffs.set( this.get( 'diffData' ) );
</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 up internal listeners
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set up internal listeners.
</ins><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="cx" style="display: block; padding: 0 10px"> this.listenTo( this, 'change:compareTwoMode', this.changeMode );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> compareTwoMode : state.compareTwoMode
</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">- // Start the router if browser supports History API
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Start the router if browser supports History API.
</ins><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="cx" style="display: block; padding: 0 10px"> if ( Backbone.History.started ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +429,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var toIndex = this.revisions.indexOf( this.get( 'to' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we were on the first revision before switching to two-handled mode,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // bump the 'to' position over one
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // bump the 'to' position over one.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( value && 0 === toIndex ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.set({
</span><span class="cx" style="display: block; padding: 0 10px"> from: this.revisions.at( toIndex ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,8 +438,8 @@
</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"> // When switching back to single-handled mode, reset 'from' model to
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // one position before the 'to' model
- if ( ! value && 0 !== toIndex ) { // '! value' means switching to single-handled mode
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // one position before the 'to' model.
+ if ( ! value && 0 !== toIndex ) { // '! value' means switching to single-handled mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set({
</span><span class="cx" style="display: block; padding: 0 10px"> from: this.revisions.at( toIndex - 1 ),
</span><span class="cx" style="display: block; padding: 0 10px"> to: this.revisions.at( toIndex )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> updatedRevisions: function( from, to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.get( 'compareTwoMode' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO: compare-two loading strategy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Compare-two loading strategy.
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.diffs.loadAll( this.revisions.pluck('id'), to.id, 40 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,9 +460,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return this.diffs.get( this._diffId );
</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">- // So long as `from` and `to` are changed at the same time, the diff
- // will only be updated once. This is because Backbone updates all of
- // the changed attributes in `set`, and then fires the `change` events.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * So long as `from` and `to` are changed at the same time, the diff
+ * will only be updated once. This is because Backbone updates all of
+ * the changed attributes in `set`, and then fires the `change` events.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> updateDiff: function( options ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var from, to, diffId, diff;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> loading: false,
</span><span class="cx" style="display: block; padding: 0 10px"> error: true
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( this._diffId === diff.id ) { // Make sure the current diff didn't change
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( this._diffId === diff.id ) { // Make sure the current diff didn't change.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'update:diff', diff );
</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">@@ -593,23 +595,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> _.bindAll( this, 'setWidth' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the button view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the button view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Buttons({
</span><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</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">- // Add the checkbox view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the checkbox view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Checkbox({
</span><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</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">- // Prep the slider model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prep the slider model.
</ins><span class="cx" style="display: block; padding: 0 10px"> var slider = new revisions.model.Slider({
</span><span class="cx" style="display: block; padding: 0 10px"> frame: this.model,
</span><span class="cx" style="display: block; padding: 0 10px"> revisions: this.model.revisions
</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">- // Prep the tooltip model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prep the tooltip model.
</ins><span class="cx" style="display: block; padding: 0 10px"> tooltip = new revisions.model.Tooltip({
</span><span class="cx" style="display: block; padding: 0 10px"> frame: this.model,
</span><span class="cx" style="display: block; padding: 0 10px"> revisions: this.model.revisions,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,22 +618,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> slider: slider
</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">- // Add the tooltip view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the tooltip view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Tooltip({
</span><span class="cx" style="display: block; padding: 0 10px"> model: tooltip
</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">- // Add the tickmarks view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the tickmarks view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Tickmarks({
</span><span class="cx" style="display: block; padding: 0 10px"> model: tooltip
</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">- // Add the slider view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the slider view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Slider({
</span><span class="cx" style="display: block; padding: 0 10px"> model: slider
</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">- // Add the Metabox view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the Metabox view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Metabox({
</span><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</span><span class="cx" style="display: block; padding: 0 10px"> }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +674,7 @@
</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">- // The tickmarks view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The tickmarks view.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.Tickmarks = wp.Backbone.View.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'revisions-tickmarks',
</span><span class="cx" style="display: block; padding: 0 10px"> direction: isRtl ? 'right' : 'left',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,13 +688,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> thisOffset = this.$el.allOffsets();
</span><span class="cx" style="display: block; padding: 0 10px"> parentOffset = this.$el.parent().allOffsets();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( index === this.model.revisions.length - 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Last one
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Last one.
</ins><span class="cx" style="display: block; padding: 0 10px"> offset = {
</span><span class="cx" style="display: block; padding: 0 10px"> rightPlusWidth: thisOffset.left - parentOffset.left + 1,
</span><span class="cx" style="display: block; padding: 0 10px"> leftPlusWidth: thisOffset.right - parentOffset.right + 1
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Normal tick
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Normal tick.
</ins><span class="cx" style="display: block; padding: 0 10px"> tick = this.$('div:nth-of-type(' + (index + 1) + ')');
</span><span class="cx" style="display: block; padding: 0 10px"> offset = tick.allPositions();
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( offset, {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,18 +721,18 @@
</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">- // The metabox view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The metabox view.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.Metabox = wp.Backbone.View.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'revisions-meta',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the 'from' view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the 'from' view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.MetaFrom({
</span><span class="cx" style="display: block; padding: 0 10px"> model: this.model,
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'diff-meta diff-meta-from'
</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">- // Add the 'to' view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the 'to' view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.MetaTo({
</span><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</span><span class="cx" style="display: block; padding: 0 10px"> }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +739,7 @@
</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">- // The revision meta view (to be extended)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The revision meta view (to be extended).
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.Meta = wp.Backbone.View.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> template: wp.template('revisions-meta'),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,13 +762,13 @@
</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">- // The revision meta 'from' view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The revision meta 'from' view.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.MetaFrom = revisions.view.Meta.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'diff-meta diff-meta-from',
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'from'
</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">- // The revision meta 'to' view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The revision meta 'to' view.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.view.MetaTo = revisions.view.Meta.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'diff-meta diff-meta-to',
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'to'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +882,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.disabledButtonCheck();
</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">- // Go to a specific model index
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Go to a specific model index.
</ins><span class="cx" style="display: block; padding: 0 10px"> gotoModel: function( toIndex ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var attributes = {
</span><span class="cx" style="display: block; padding: 0 10px"> to: this.model.revisions.at( toIndex )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,13 +897,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.set( attributes );
</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">- // Go to the 'next' revision
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Go to the 'next' revision.
</ins><span class="cx" style="display: block; padding: 0 10px"> nextRevision: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var toIndex = this.model.revisions.indexOf( this.model.get('to') ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px"> this.gotoModel( toIndex );
</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">- // Go to the 'previous' revision
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Go to the 'previous' revision.
</ins><span class="cx" style="display: block; padding: 0 10px"> previousRevision: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var toIndex = this.model.revisions.indexOf( this.model.get('to') ) - 1;
</span><span class="cx" style="display: block; padding: 0 10px"> this.gotoModel( toIndex );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,12 +958,12 @@
</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"> mouseMove: function( e ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var zoneCount = this.model.revisions.length - 1, // One fewer zone than models
- sliderFrom = this.$el.allOffsets()[this.direction], // "From" edge of slider
- sliderWidth = this.$el.width(), // Width of slider
- tickWidth = sliderWidth / zoneCount, // Calculated width of zone
- actualX = ( isRtl ? $(window).width() - e.pageX : e.pageX ) - sliderFrom, // Flipped for RTL - sliderFrom;
- currentModelIndex = Math.floor( ( actualX + ( tickWidth / 2 ) ) / tickWidth ); // Calculate the model index
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var zoneCount = this.model.revisions.length - 1, // One fewer zone than models.
+ sliderFrom = this.$el.allOffsets()[this.direction], // "From" edge of slider.
+ sliderWidth = this.$el.width(), // Width of slider.
+ tickWidth = sliderWidth / zoneCount, // Calculated width of zone.
+ actualX = ( isRtl ? $(window).width() - e.pageX : e.pageX ) - sliderFrom, // Flipped for RTL - sliderFrom.
+ currentModelIndex = Math.floor( ( actualX + ( tickWidth / 2 ) ) / tickWidth ); // Calculate the model index.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure sane value for currentModelIndex.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( currentModelIndex < 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -970,7 +972,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> currentModelIndex = this.model.revisions.length - 1;
</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">- // Update the tooltip mode
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update the tooltip mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.set({ hoveredRevision: this.model.revisions.at( currentModelIndex ) });
</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">@@ -987,7 +989,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var handles = this.$('a.ui-slider-handle');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.model.get('compareTwoMode') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // in RTL mode the 'left handle' is the second in the slider, 'right' is first
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // In RTL mode the 'left handle' is the second in the slider, 'right' is first.
</ins><span class="cx" style="display: block; padding: 0 10px"> handles.first()
</span><span class="cx" style="display: block; padding: 0 10px"> .toggleClass( 'to-handle', !! isRtl )
</span><span class="cx" style="display: block; padding: 0 10px"> .toggleClass( 'from-handle', ! isRtl );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,10 +1021,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Adjust left/right boundaries and reset points.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( view.model.get('compareTwoMode') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> handles = handle.parent().find('.ui-slider-handle');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( handle.is( handles.first() ) ) { // We're the left handle
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( handle.is( handles.first() ) ) {
+ // We're the left handle.
</ins><span class="cx" style="display: block; padding: 0 10px"> rightDragBoundary = handles.last().offset().left;
</span><span class="cx" style="display: block; padding: 0 10px"> rightDragReset = rightDragBoundary - sliderOffset;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else { // We're the right handle
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // We're the right handle.
</ins><span class="cx" style="display: block; padding: 0 10px"> leftDragBoundary = handles.first().offset().left + handles.first().width();
</span><span class="cx" style="display: block; padding: 0 10px"> leftDragReset = leftDragBoundary - sliderOffset;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,12 +1047,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return isRtl ? this.model.revisions.length - position - 1: position;
</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">- // Responds to slide events
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Responds to slide events.
</ins><span class="cx" style="display: block; padding: 0 10px"> slide: function( event, ui ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var attributes, movedRevision;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Compare two revisions mode
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compare two revisions mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.model.get('compareTwoMode') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prevent sliders from occupying same spot
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent sliders from occupying same spot.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ui.values[1] === ui.values[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1072,7 +1076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> movedRevision = this.model.revisions.at( this.getPosition( ui.value ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If we are scrubbing, a scrub to a revision is considered a hover
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we are scrubbing, a scrub to a revision is considered a hover.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( this.model.get('scrubbing') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> attributes.hoveredRevision = movedRevision;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,7 +1086,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> stop: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).off('mousemove.wp.revisions');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.updateSliderSettings(); // To snap us back to a tick mark
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model.updateSliderSettings(); // To snap us back to a tick mark.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.set({ scrubbing: false });
</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">@@ -1105,7 +1109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function( options ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.model = options.model;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Maintain state and history when navigating
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Maintain state and history when navigating.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'update:diff', _.debounce( this.updateUrl, 250 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:compareTwoMode', this.updateUrl );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>