Changeset 24664

Timestamp:

07/11/2013 10:56:48 PM (13 years ago)

Author:

markjaquith

Message:

Revisions: real URLs and preloading of the requested diff.

• Real URLs are being used now, using pushState. ?revision={id} or ?from={from}&to={to}.
• Drop the redundant action=edit from the URLs (this is the default).
• The initial comparison is preloaded, whether a single revision or a compare-two situation.

See #24425.

Location:

trunk

Files:

• wp-admin/includes/revision.php (modified) (2 diffs)
• wp-admin/js/revisions.js (modified) (10 diffs)
• wp-admin/revision.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-admin/includes/revision.php

@@ -62 +62 @@
 }
 
-function wp_prepare_revisions_for_js( $post, $selected_revision_id ) {
+function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
         $post = get_post( $post );
         $revisions = array();
@@ -99 +99 @@
         }
 
+        // Now, grab the initial diff
+        if ( ! $from ) { // Single mode
+                $initial_revisions = array_reverse( array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ), 2, true ) ) );
+                $compare_two_mode = false;
+        } else { // Compare two
+                $compare_two_mode = true;
+                $initial_revisions = array( $from, $selected_revision_id );
+        }
+        $diffs = array( array(
+                'id' => $initial_revisions[0] . ':' . $initial_revisions[1],
+                'fields' => wp_get_revision_ui_diff( $post->ID, $initial_revisions[0], $initial_revisions[1] ),
+        ));
+
         return array(
                 'postId'           => $post->ID,
                 'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
                 'revisionData'     => array_values( $revisions ),
-                'selectedRevision' => $selected_revision_id,
+                'to'               => $selected_revision_id,
+                'from'             => $from,
+                'diffData'         => $diffs,
+                'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
+                'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
         );
 }

trunk/wp-admin/js/revisions.js

@@ -18 +18 @@
 
         // wp_localize_script transforms top-level numbers into strings. Undo that.
-        if ( revisions.settings.selectedRevision )
-                revisions.settings.selectedRevision = parseInt( revisions.settings.selectedRevision, 10 );
-
+        if ( revisions.settings.to )
+                revisions.settings.to = parseInt( revisions.settings.to, 10 );
+        if ( revisions.settings.from )
+                revisions.settings.from = parseInt( revisions.settings.from, 10 );
+
+        // wp_localize_script does not allow for top-level booleans. Fix that.
+        if ( revisions.settings.compareTwoMode )
+                revisions.settings.compareTwoMode = revisions.settings.compareTwoMode === '1';
 
         /**
@@ -41 +46 @@
                         this.set({
                                 max:   this.revisions.length - 1,
-                                value: this.revisions.indexOf( this.revisions.get( revisions.settings.selectedRevision ) ),
+                                value: this.revisions.indexOf( this.revisions.get( revisions.settings.to ) ),
                                 compareTwoMode: this.frame.get('compareTwoMode')
                         });
@@ -315 +320 @@
 
         revisions.model.FrameState = Backbone.Model.extend({
+                defaults: {
+                        compareTwoMode: false
+                },
+
                 initialize: function( attributes, options ) {
                         var properties = {};
@@ -323 +332 @@
                         this.diffs = new revisions.model.Diffs( [], { revisions: this.revisions });
 
-                        // Set the initial revision provided through the settings.
-                        properties.to = this.revisions.get( revisions.settings.selectedRevision );
-                        properties.from = this.revisions.prev( properties.to );
-                        properties.compareTwoMode = false;
+                        // Set the initial diffs collection provided through the settings
+                        this.diffs.set( revisions.settings.diffData );
+
+                        // Set the initial revisions, baseUrl, and mode as provided through settings
+                        properties.to = this.revisions.get( revisions.settings.to );
+                        properties.from = this.revisions.get( revisions.settings.from ) || this.revisions.prev( properties.to );
+                        properties.compareTwoMode = revisions.settings.compareTwoMode;
+                        properties.baseUrl = revisions.settings.baseUrl;
                         this.set( properties );
 
@@ -332 +345 @@
                         // the `from` and `to` revisions accurately reflect the hash.
                         this.router = new revisions.Router({ model: this });
-                        Backbone.history.start();
-
+                        Backbone.history.start({ pushState: true });
+
+                        // Set up internal listeners
                         this.listenTo( this, 'change:from', this.changeRevisionHandler );
                         this.listenTo( this, 'change:to', this.changeRevisionHandler );
@@ -938 +952 @@
                 initialize: function( options ) {
                         this.model = options.model;
+                        this.routes = this.getRoutes();
 
                         // Maintain state history when dragging
@@ -943 +958 @@
                 },
 
-                routes: {
-                        'from/:from/to/:to': 'handleRoute',
-                        'at/:to': 'handleRoute'
+                getRoutes: function() {
+                        var routes = {};
+                        routes[this.baseUrl( '?from=:from&to=:to' )] = 'handleRoute';
+                        routes[this.baseUrl( '?revision=:to' )] = 'handleRoute';
+                        return routes;
+                },
+
+                baseUrl: function( url ) {
+                        return this.model.get('baseUrl') + url;
                 },
 
@@ -952 +973 @@
                         var to = this.model.get('to').id;
                         if ( this.model.get('compareTwoMode' ) )
-                                this.navigate( 'from/' + from + '/to/' + to );
+                                this.navigate( this.baseUrl( '?from=' + from + '&to=' + to ) );
                         else
-                                this.navigate( 'at/' + to );
+                                this.navigate( this.baseUrl( '?revision=' + to ) );
                 },
 
@@ -965 +986 @@
                                 a = this.model.revisions.prev( b );
                                 b = b ? b.id : 0;
-                                a = a ? a.id : 0
+                                a = a ? a.id : 0;
                                 compareTwo = false;
                         } else {
@@ -985 +1006 @@
                                 });
                         }
-                        revisions.settings.selectedRevision = to;
+                        revisions.settings.to = to;
                 }
         });

trunk/wp-admin/revision.php

@@ -12 +12 @@
 require ABSPATH . 'wp-admin/includes/revision.php';
 
-wp_reset_vars( array( 'revision', 'action' ) );
+wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
 
 $revision_id = absint( $revision );
+$from = absint( $from );
+if ( ! $revision_id )
+        $revision_id = absint( $to );
 $redirect = 'edit.php';
 
@@ -80 +83 @@
 
 wp_enqueue_script( 'revisions' );
-wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id ) );
+wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
 
 /* Revisions Help Tab */

trunk/wp-includes/link-template.php

@@ -898 +898 @@
                 return;
 
-        if ( 'display' == $context )
+        if ( 'revision' === $post->post_type )
+                $action = '';
+        elseif ( 'display' == $context )
                 $action = '&action=edit';
         else