<!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>[24638] trunk/wp-admin/js/revisions.js: Revisions: simpler hash URLs.</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/24638">24638</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-10 06:08:56 +0000 (Wed, 10 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: simpler hash URLs. Misc refactoring.
* Single mode: `#at/:to`
* Compare two mode: `#from/:from/to/:to`
* Make use of `_.isUndefined()`
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 (24637 => 24638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-10 06:04:28 UTC (rev 24637)
+++ trunk/wp-admin/js/revisions.js 2013-07-10 06:08:56 UTC (rev 24638)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> revisions = wp.revisions = { model: {}, view: {}, controller: {} };
</span><span class="cx">
</span><span class="cx"> // Link settings.
</span><del>- revisions.settings = typeof _wpRevisionsSettings === 'undefined' ? {} : _wpRevisionsSettings;
</del><ins>+ revisions.settings = _.isUndefined( _wpRevisionsSettings ) ? {} : _wpRevisionsSettings;
</ins><span class="cx">
</span><span class="cx"> // For debugging
</span><span class="cx"> revisions.debug = true;
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx">
</span><span class="cx"> // In single handle mode, the 1st stored revision is 'blank' and the 'from' model is not set
</span><span class="cx"> // In this case we move the to index over one
</span><del>- if ( 'undefined' == typeof this.model.get('from') ) {
</del><ins>+ if ( _.isUndefined( this.model.get('from') ) ) {
</ins><span class="cx"> if ( isRtl ) {
</span><span class="cx"> leftValue = this.model.revisions.length - this.model.revisions.indexOf( this.model.get('to') ) - 2;
</span><span class="cx"> rightValue = leftValue + 1;
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> slide: function( event, ui ) {
</span><span class="cx"> var attributes;
</span><span class="cx"> // Compare two revisions mode
</span><del>- if ( 'undefined' !== typeof ui.values && this.model.get('compareTwoMode') ) {
</del><ins>+ if ( ! _.isUndefined( ui.values ) && 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="lines">@@ -893,24 +893,37 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> routes: {
</span><del>- 'revision/from/:from/to/:to/handles/:handles': 'gotoRevisionId'
</del><ins>+ 'from/:from/to/:to': 'handleRoute',
+ 'at/:to': 'routeSingle'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateUrl: function() {
</span><span class="cx"> var from = this.model.has('from') ? this.model.get('from').id : 0;
</span><span class="cx"> var to = this.model.get('to').id;
</span><del>- var handles = this.model.get('compareTwoMode') ? '2' : '1';
-
- this.navigate( '/revision/from/' + from + '/to/' + to + '/handles/' + handles );
</del><ins>+ if ( this.model.get('compareTwoMode' ) )
+ this.navigate( 'from/' + from + '/to/' + to );
+ else
+ this.navigate( 'at/' + to );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- gotoRevisionId: function( from, to, handles ) {
- from = parseInt( from, 10 );
- to = parseInt( to, 10 );
</del><ins>+ handleRoute: function( a, b ) {
+ var from, to, compareTwo;
</ins><span class="cx">
</span><del>- this.model.set({ compareTwoMode: ( '2' === handles ) });
</del><ins>+ // If `b` is undefined, this was a 'revision/:to' route
+ if ( _.isUndefined( b ) ) {
+ b = a;
+ a = 0;
+ compareTwo = true;
+ } else {
+ compareTwo = false;
+ }
</ins><span class="cx">
</span><del>- if ( 'undefined' !== typeof this.model ) {
</del><ins>+ from = parseInt( a, 10 );
+ to = parseInt( b, 10 );
+
+ this.model.set({ compareTwoMode: compareTwo });
+
+ if ( ! _.isUndefined( this.model ) ) {
</ins><span class="cx"> var selectedToRevision = this.model.revisions.findWhere({ id: to }),
</span><span class="cx"> selectedFromRevision = this.model.revisions.findWhere({ id: from });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>