Ticket #24425: 24425.draft.33.diff

wp-admin/js/revisions.js

@@ -394 +394 @@
                 template: wp.template( 'revisions-tooltip' ),
 
                 initialize: function() {
-                        this.listenTo( this.model, 'change:sliderHovering', this.sliderHoveringChanged );
+                        this.listenTo( this.model, 'change:showTooltip', this.sliderHoveringChanged );
                         this.listenTo( this.model, 'change:tooltipPosition', this.tooltipPositionChanged );
                 },
 
                 ready: function() {
                 },
 
-                // Show or hide tooltip based on sliderHovering is true
+                // Show or hide tooltip based on showTooltip is true
                 sliderHoveringChanged: function() {
-                        if ( this.model.get( 'sliderHovering' ) ) {
+                        if ( this.model.get( 'showTooltip' ) ) {
                                 this.$el.show();
                         } else {
                                 this.$el.hide();
@@ -521 +521 @@
                         // Find the initially selected revision
                         var initiallySelectedRevisionIndex =
                                 this.model.revisions.indexOf(
-                                        this.model.revisions.findWhere(  { id: Number( revisions.settings.selectedRevision ) } ) );
+                                        this.model.revisions.findWhere( { id: Number( revisions.settings.selectedRevision ) } ) );
 
                         this.settings = new revisions.model.Slider({
                                 max:   latestRevisionIndex,
@@ -533 +533 @@
                 },
 
                 ready: function() {
+                        // Refresh the currently selected revision position in case router has set it.
+                        this.settings.attributes.value = this.model.revisions.indexOf(
+                                this.model.revisions.findWhere( { id: Number( revisions.settings.selectedRevision ) } ) );
+                        this.slide( '', this.settings.attributes );
+
                         this.$el.slider( this.settings.toJSON() );
 
                         // Listen for changes in Compare Two Mode setting
                         this.listenTo( this.model, 'change:compareTwoMode', this.updateSliderSettings );
 
-                        this.settings.on( 'change', function( model, options ) {
+                        this.settings.on( 'change', function() {
                                 this.updateSliderSettings();
                         }, this );
 
                         // Listen for changes in the diffId
                         this.listenTo( this.model, 'change:diffId', this.diffIdChanged );
 
-                        // Reset to the initially selected revision
-                        this.slide( '', this.settings.attributes );
-
                 },
 
                 mousemove: function( e ) {
@@ -574 +576 @@
                 },
 
                 mouseenter: function( e ) {
-                        this.model.set( 'sliderHovering', true );
+                        this.model.set( 'showTooltip', true );
                 },
 
                 mouseleave: function( e ) {
-                        this.model.set( 'sliderHovering', false );
+                        this.model.set( 'showTooltip', false );
                 },
 
                 updateSliderSettings: function() {
@@ -740 +742 @@
                 }, 250 ),
 
                 gotoRevisionId: function( from, to, handles ) {
-                        if ( '2' === handles ) {
-                                this.model.set( { compareTwoMode: true } );
-                        } else {
-                                this.model.set( { compareTwoMode: false } );
-                        }
+                        this.model.set( { compareTwoMode: '2' === handles } );
 
                         if ( 'undefined' !== typeof this.model ) {
                                 var selectedToRevision =
@@ -756 +754 @@
                                         to:   selectedToRevision,
                                         from: selectedFromRevision } );
                         }
+                        revisions.settings.selectedRevision = to;
                 }
         });