<!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>[24579] trunk/wp-admin/js/revisions.js: Revisions improvements</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/24579">24579</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-07-06 20:22:02 +0000 (Sat, 06 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions improvements
* Enable smooth sliding in Compare two mode
props adamsilverstein. 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 (24578 => 24579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-06 10:48:14 UTC (rev 24578)
+++ trunk/wp-admin/js/revisions.js 2013-07-06 20:22:02 UTC (rev 24579)
</span><span class="lines">@@ -236,6 +236,8 @@
</span><span class="cx">
</span><span class="cx"> this.listenTo( this.model, 'change:diffId', this.updateDiff );
</span><span class="cx">
</span><ins>+ this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
+
</ins><span class="cx"> this.views.set( '.revisions-control-frame', new revisions.view.Controls({
</span><span class="cx"> model: this.model
</span><span class="cx"> }) );
</span><span class="lines">@@ -275,6 +277,10 @@
</span><span class="cx"> }));
</span><span class="cx"> this.model.trigger( 'renderDiff' );
</span><span class="cx"> });
</span><ins>+ },
+
+ updateCompareTwoMode: function() {
+ this.$el.toggleClass( 'comparing-two-revisions' );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -336,11 +342,8 @@
</span><span class="cx">
</span><span class="cx"> updateMeta: function() {
</span><span class="cx"> this.$el.html( this.template( this.model.toJSON() ) );
</span><del>- if( this.model.get( 'to' ).attributes.current ) {
- $( '#restore-revision' ).prop( 'disabled', true );
- } else {
- $( '#restore-revision' ).prop( 'disabled', false );
- }
</del><ins>+
+ $( '#restore-revision' ).prop( 'disabled', this.model.get( 'to' ).attributes.current );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -375,11 +378,7 @@
</span><span class="cx"> // Toggle the compare two mode feature when the compare two checkbox is checked.
</span><span class="cx"> compareTwoToggle: function( event ) {
</span><span class="cx"> // Activate compare two mode?
</span><del>- if ( $( '.compare-two-revisions' ).is( ':checked' ) ) {
- this.model.set( { compareTwoMode: true } );
- } else {
- this.model.set( { compareTwoMode: false } );
- }
</del><ins>+ this.model.set( { compareTwoMode: $( '.compare-two-revisions' ).prop( 'checked' ) } );
</ins><span class="cx">
</span><span class="cx"> // Update route
</span><span class="cx"> this.model.revisionsRouter.navigateRoute( this.model.get( 'to').id, this.model.get( 'from' ).id );
</span><span class="lines">@@ -545,9 +544,7 @@
</span><span class="cx">
</span><span class="cx"> // And update the slider in case the route has set it.
</span><span class="cx"> this.updateSliderSettings();
</span><del>-
</del><span class="cx"> this.slide( '', this.settings.attributes );
</span><del>-
</del><span class="cx"> this.$el.slider( this.settings.toJSON() );
</span><span class="cx">
</span><span class="cx"> // Listen for changes in Compare Two Mode setting
</span><span class="lines">@@ -568,7 +565,7 @@
</span><span class="cx"> actualX = e.clientX - sliderLeft,
</span><span class="cx"> hoveringAt = Math.floor( actualX / tickWidth );
</span><span class="cx">
</span><del>- // Reverse direction in Rtl mode.
</del><ins>+ // Reverse direction in RTL mode.
</ins><span class="cx"> if ( isRtl )
</span><span class="cx"> hoveringAt = this.model.revisions.length - hoveringAt - 1;
</span><span class="cx">
</span><span class="lines">@@ -606,7 +603,7 @@
</span><span class="cx"> rightValue = leftValue + 1;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- leftValue = isRtl ? this.model.revisions.length - this.model.revisions.indexOf( this.model.get( 'to' ) ) - 1 :
</del><ins>+ leftValue = 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( 'from' ) ),
</span><span class="cx"> rightValue = isRtl ? this.model.revisions.length - this.model.revisions.indexOf( this.model.get( 'from' ) ) - 1 :
</span><span class="cx"> this.model.revisions.indexOf( this.model.get( 'to' ) );
</span><span class="lines">@@ -631,9 +628,8 @@
</span><span class="cx"> range: false
</span><span class="cx"> } );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ( this.model.get( 'compareTwoMode' ) ){
</span><del>- $( '.revisions' ).addClass( 'comparing-two-revisions' );
-
</del><span class="cx"> // in RTL mode the 'left handle' is the second in the slider, 'right' is first
</span><span class="cx"> $( 'a.ui-slider-handle', this.$el )
</span><span class="cx"> .first()
</span><span class="lines">@@ -643,8 +639,6 @@
</span><span class="cx"> .last()
</span><span class="cx"> .addClass( isRtl ? 'left-handle' : 'right-handle' )
</span><span class="cx"> .removeClass( isRtl ? 'right-handle' : 'left-handle' );
</span><del>- } else {
- $( '.revisions' ).removeClass( 'comparing-two-revisions' );
</del><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -665,23 +659,53 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> start: function( event, ui ) {
</span><del>- if ( this.model.get( 'compareTwoMode' ) )
- return;
-
</del><span class="cx"> // Track the mouse position to enable smooth dragging,
</span><del>- // overrides default jQuery UI step behaviour.
- $( window ).on( 'mousemove', { slider: this }, function( e ) {
- var slider = e.data.slider,
- sliderLeft = slider.$el.offset().left,
- sliderRight = sliderLeft + slider.$el.width();
</del><ins>+ // overrides default jQuery UI step behavior.
+ $( window ).on( 'mousemove', { view: this }, function( e ) {
+ var view = e.data.view,
+ leftDragBoundary = view.$el.offset().left, // Initial left boundary
+ sliderOffset = leftDragBoundary,
+ sliderRightEdge = leftDragBoundary + view.$el.width(),
+ rightDragBoundary = sliderRightEdge, // Initial right boundary
+ leftDragReset = 0, // Initial left drag reset
+ rightDragReset = sliderRightEdge - sliderOffset; // Initial right drag reset
</ins><span class="cx">
</span><ins>+ // In two handle mode, ensure handles can't be dragged past each other.
+ // Adjust left/right boundaries and reset points.
+ if ( view.model.get( 'compareTwoMode' ) ) {
+ var rightHandle = $( ui.handle ).parent().find( '.right-handle' ),
+ leftHandle = $( ui.handle ).parent().find( '.left-handle' );
+
+ if ( $( ui.handle ).hasClass( 'left-handle' ) ) {
+ // Dragging the left handle, boundary is right handle.
+ // RTL mode calculations reverse directions.
+ if ( isRtl ) {
+ leftDragBoundary = rightHandle.offset().left + rightHandle.width();
+ leftDragReset = leftDragBoundary - sliderOffset;
+ } else {
+ rightDragBoundary = rightHandle.offset().left;
+ rightDragReset = rightDragBoundary - sliderOffset;
+ }
+ } else {
+ // Dragging the right handle, boundary is the left handle.
+ // RTL mode calculations reverse directions.
+ if ( isRtl ) {
+ rightDragBoundary = leftHandle.offset().left;
+ rightDragReset = rightDragBoundary - sliderOffset;
+ } else {
+ leftDragBoundary = leftHandle.offset().left + leftHandle.width() ;
+ leftDragReset = leftDragBoundary - sliderOffset;
+ }
+ }
+ }
+
</ins><span class="cx"> // Follow mouse movements, as long as handle remains inside slider.
</span><del>- if ( e.clientX < sliderLeft ) {
- $( ui.handle ).css( 'left', 0 ); // Mouse to left of slider.
- } else if ( e.clientX > sliderRight ) {
- $( ui.handle ).css( 'left', sliderRight - sliderLeft); // Mouse to right of slider.
</del><ins>+ if ( e.clientX < leftDragBoundary ) {
+ $( ui.handle ).css( 'left', leftDragReset ); // Mouse to left of slider.
+ } else if ( e.clientX > rightDragBoundary ) {
+ $( ui.handle ).css( 'left', rightDragReset ); // Mouse to right of slider.
</ins><span class="cx"> } else {
</span><del>- $( ui.handle ).css( 'left', e.clientX - sliderLeft ); // Mouse in slider.
</del><ins>+ $( ui.handle ).css( 'left', e.clientX - sliderOffset ); // Mouse in slider.
</ins><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx"> },
</span><span class="lines">@@ -716,9 +740,6 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> stop: function( event, ui ) {
</span><del>- if ( this.model.get( 'compareTwoMode' ) )
- return;
-
</del><span class="cx"> $( window ).off( 'mousemove' );
</span><span class="cx">
</span><span class="cx"> // Reset settings props handle back to the step position.
</span></span></pre>
</div>
</div>
</body>
</html>