WordPress 4.0

[autoinstalls/wordpress.git] / wp-admin / js / revisions.js

diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js
index 48866d6ffca4489d6ac063e89cb6b233ff87d05a..521e55ce09a2040b90dc3d6fa740f68c925f33d2 100644 (file)
--- a/wp-admin/js/revisions.js
+++ b/wp-admin/js/revisions.js
@@ -399,11 +399,23 @@ window.wp = window.wp || {};
                },
 
                changeMode: function( model, value ) {
-                       // If we were on the first revision before switching, we have to bump them over one
-                       if ( value && 0 === this.revisions.indexOf( this.get('to') ) ) {
+                       var toIndex = this.revisions.indexOf( this.get( 'to' ) );
+
+                       // If we were on the first revision before switching to two-handled mode,
+                       // bump the 'to' position over one
+                       if ( value && 0 === toIndex ) {
+                               this.set({
+                                       from: this.revisions.at( toIndex ),
+                                       to:   this.revisions.at( toIndex + 1 )
+                               });
+                       }
+
+                       // When switching back to single-handled mode, reset 'from' model to
+                       // one position before the 'to' model
+                       if ( ! value && 0 !== toIndex ) { // '! value' means switching to single-handled mode
                                this.set({
-                                       from: this.revisions.at(0),
-                                       to: this.revisions.at(1)
+                                       from: this.revisions.at( toIndex - 1 ),
+                                       to:   this.revisions.at( toIndex )
                                });
                        }
                },