<!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>[24679] trunk/wp-admin/js/revisions.js: Revisions: Code and whitespace cleanup.</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/24679">24679</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-12 18:14:23 +0000 (Fri, 12 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Code and whitespace cleanup.
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 (24678 => 24679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-12 17:25:27 UTC (rev 24678)
+++ trunk/wp-admin/js/revisions.js 2013-07-12 18:14:23 UTC (rev 24679)
</span><span class="lines">@@ -737,9 +737,7 @@
</span><span class="cx"> currentModelIndex = this.model.revisions.length - 1;
</span><span class="cx">
</span><span class="cx"> // Update the tooltip model
</span><del>- this.model.set({
- 'hoveredRevision': this.model.revisions.at( currentModelIndex )
- });
</del><ins>+ this.model.set({ hoveredRevision: this.model.revisions.at( currentModelIndex ) });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> mouseLeave: function() {
</span><span class="lines">@@ -827,21 +825,20 @@
</span><span class="cx">
</span><span class="cx"> // Responds to slide events
</span><span class="cx"> slide: function( event, ui ) {
</span><del>- var attributes, movedRevision;
</del><ins>+ var attributes, movedRevision, sliderPosition;
</ins><span class="cx"> // Compare two revisions mode
</span><del>- if ( ! _.isUndefined( ui.values ) && this.model.get('compareTwoMode') ) {
</del><ins>+ if ( this.model.get('compareTwoMode') ) {
</ins><span class="cx"> // Prevent sliders from occupying same spot
</span><span class="cx"> if ( ui.values[1] === ui.values[0] )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> attributes = {
</span><del>- to: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[0] - 1 : ui.values[1] ), // Reverse directions for RTL.
- from: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[1] - 1 : ui.values[0] ) // Reverse directions for RTL.
</del><ins>+ to: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[0] - 1 : ui.values[1] ),
+ from: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[1] - 1 : ui.values[0] )
</ins><span class="cx"> };
</span><span class="cx"> movedRevision = ! isRtl && ui.value === ui.values[0] ? attributes.from : attributes.to;
</span><span class="cx"> } else {
</span><del>- // Compare single revision mode
- var sliderPosition = this.getSliderPosition( ui );
</del><ins>+ sliderPosition = this.getSliderPosition( ui );
</ins><span class="cx"> attributes = {
</span><span class="cx"> to: this.model.revisions.at( sliderPosition )
</span><span class="cx"> };
</span><span class="lines">@@ -884,20 +881,15 @@
</span><span class="cx"> revisions.Router = Backbone.Router.extend({
</span><span class="cx"> initialize: function( options ) {
</span><span class="cx"> this.model = options.model;
</span><del>- this.routes = this.getRoutes();
-
- // Maintain state history when dragging/clicking
</del><ins>+ this.routes = _.object([
+ [ this.baseUrl( '?from=:from&to=:to' ), 'handleRoute' ],
+ [ this.baseUrl( '?from=:from&to=:to' ), 'handleRoute' ]
+ ]);
+ // Maintain state and history when navigating
</ins><span class="cx"> this.listenTo( this.model, 'update:diff', _.debounce( this.updateUrl, 250 ) );
</span><span class="cx"> this.listenTo( this.model, 'change:compareTwoMode', this.updateUrl );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- getRoutes: function() {
- var routes = {};
- routes[this.baseUrl( '?from=:from&to=:to' )] = 'handleRoute';
- routes[this.baseUrl( '?revision=:to' )] = 'handleRoute';
- return routes;
- },
-
</del><span class="cx"> baseUrl: function( url ) {
</span><span class="cx"> return this.model.get('baseUrl') + url;
</span><span class="cx"> },
</span><span class="lines">@@ -912,34 +904,20 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleRoute: function( a, b ) {
</span><del>- var from, to, compareTwo;
</del><ins>+ var from, to, compareTwo = _.isUndefined( b );
</ins><span class="cx">
</span><del>- // If `b` is undefined, this is an 'at/:to' route, for a single revision
- if ( _.isUndefined( b ) ) {
</del><ins>+ if ( ! compareTwo ) {
</ins><span class="cx"> b = this.model.revisions.get( a );
</span><span class="cx"> a = this.model.revisions.prev( b );
</span><span class="cx"> b = b ? b.id : 0;
</span><span class="cx"> a = a ? a.id : 0;
</span><del>- compareTwo = false;
- } else {
- compareTwo = true;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- from = parseInt( a, 10 );
- to = parseInt( b, 10 );
-
- this.model.set({ compareTwoMode: compareTwo });
-
- if ( ! _.isUndefined( this.model ) ) {
- var selectedToRevision = this.model.revisions.get( to ),
- selectedFromRevision = this.model.revisions.get( from );
-
- this.model.set({
- to: selectedToRevision,
- from: selectedFromRevision
- });
- }
- revisions.settings.to = to;
</del><ins>+ this.model.set({
+ from: this.model.revisions.get( parseInt( a, 10 ) ),
+ to: this.model.revisions.get( parseInt( a, 10 ) ),
+ compareTwoMode: compareTwo
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>