<!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>[24636] trunk/wp-admin/js/revisions.js: Revisions: remove some redundant code.</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/24636">24636</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-10 05:40:45 +0000 (Wed, 10 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: remove some redundant code.
* Move some slider code into the slider view that was loitering in the checkmark view.
* `this.$()`, not `$()`.
* Cache a selector.
* `toggleClass()`, not `addClass()` with a ternary.
* Remove two classes with a single `removeClass()`.
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 (24635 => 24636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-10 05:38:17 UTC (rev 24635)
+++ trunk/wp-admin/js/revisions.js 2013-07-10 05:40:45 UTC (rev 24636)
</span><span class="lines">@@ -495,16 +495,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateCompareTwoMode: function() {
</span><del>- if ( this.model.get('compareTwoMode') ) {
- $('.compare-two-revisions').prop( 'checked', true );
- // in RTL mode the 'left handle' is the second in the slider, 'right' is first
- $('.wp-slider a.ui-slider-handle').first().addClass( isRtl ? 'right-handle' : 'left-handle' );
- $('.wp-slider a.ui-slider-handle').last().addClass( isRtl ? 'left-handle' : 'right-handle' );
- } else {
- $('.compare-two-revisions').prop( 'checked', false );
- $('.wp-slider a.ui-slider-handle').removeClass('left-handle').removeClass('right-handle');
- }
-
</del><ins>+ this.$('.compare-two-revisions').prop( 'checked', this.model.get('compareTwoMode') );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Toggle the compare two mode feature when the compare two checkbox is checked.
</span><span class="lines">@@ -720,6 +711,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateSliderSettings: function() {
</span><ins>+ var handles;
+
</ins><span class="cx"> if ( this.model.get('compareTwoMode') ) {
</span><span class="cx"> var leftValue, rightValue;
</span><span class="cx">
</span><span class="lines">@@ -750,27 +743,26 @@
</span><span class="cx"> value: null,
</span><span class="cx"> range: true // Range mode ensures handles can't cross
</span><span class="cx"> } );
</span><ins>+
+ handles = this.$('a.ui-slider-handle');
+ // in RTL mode the 'left handle' is the second in the slider, 'right' is first
+ handles.first()
+ .toggleClass( 'right-handle', !! isRtl )
+ .toggleClass( 'left-handle', ! isRtl );
+ handles.last()
+ .toggleClass( 'left-handle', !! isRtl )
+ .toggleClass( 'right-handle', ! isRtl );
+
</ins><span class="cx"> } else {
</span><span class="cx"> this.$el.slider( { // Set handle to current to model
</span><span class="cx"> // Reverse order for RTL.
</span><del>- value: isRtl ? this.model.revisions.length - this.model.revisions.indexOf( this.model.get('to') ) - 1 :
</del><ins>+ value: isRtl ? this.model.revisions.length - this.model.revisions.indexOf( this.model.get('to') ) - 1 :
</ins><span class="cx"> this.model.revisions.indexOf( this.model.get('to') ),
</span><span class="cx"> values: null, // Clear existing two handled values
</span><span class="cx"> range: false
</span><span class="cx"> } );
</span><ins>+ this.$('a.ui-slider-handle').removeClass('left-handle right-handle');
</ins><span class="cx"> }
</span><del>-
- if ( this.model.get('compareTwoMode') ){
- // in RTL mode the 'left handle' is the second in the slider, 'right' is first
- $( 'a.ui-slider-handle', this.$el )
- .first()
- .addClass( isRtl ? 'right-handle' : 'left-handle' )
- .removeClass( isRtl ? 'left-handle' : 'right-handle' );
- $( 'a.ui-slider-handle', this.$el )
- .last()
- .addClass( isRtl ? 'left-handle' : 'right-handle' )
- .removeClass( isRtl ? 'right-handle' : 'left-handle' );
- }
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateRevisions: function( from, to ) {
</span></span></pre>
</div>
</div>
</body>
</html>