Changeset 24606

Timestamp:

07/09/2013 08:14:38 AM (13 years ago)

Author:

koopersmith

Message:

Revisions: Simplify how URLs are updated. See #24425.

File:

• trunk/wp-admin/js/revisions.js (modified) (4 diffs)

trunk/wp-admin/js/revisions.js

@@ -413 +413 @@
 
                         // Update route
-                        this.model.revisionsRouter.navigateRoute( this.model.get('to').id, this.model.get('from').id );
+                        this.model.revisionsRouter.updateUrl();
                 },
 
@@ -499 +499 @@
 
                         // Update route
-                        this.model.revisionsRouter.navigateRoute( attributes.to.id, attributes.from ? attributes.from.id : 0 );
+                        this.model.revisionsRouter.updateUrl();
                 },
 
@@ -797 +797 @@
 
                         // Maintain state history when dragging
-                        this.listenTo( this.model, 'renderDiff', this.updateURL );
+                        this.listenTo( this.model, 'renderDiff', _.debounce( this.updateUrl, 250 ) );
                 },
 
@@ -804 +804 @@
                 },
 
-                navigateRoute: function( to, from ) {
-                        var navigateTo = '/revision/from/' + from + '/to/' + to + '/handles/';
-                        if ( this.model.get('compareTwoMode') ) {
-                                navigateTo += '2';
-                        } else {
-                                navigateTo += '1';
-                        }
-                        this.navigate( navigateTo );
-                },
-
-                updateURL: _.debounce( function() {
-                        var from = this.model.get('from');
-                        this.navigateRoute( this.model.get('to').id, from ? from.id : 0 );
-                }, 250 ),
+                updateUrl: function() {
+                        var from = this.model.has('from') ? this.model.get('from').id : 0;
+                        var to = this.model.get('to').id;
+                        var handles = this.model.get('compareTwoMode') ? '2' : '1';
+
+                        this.navigate( '/revision/from/' + from + '/to/' + to + '/handles/' + handles );
+                },
 
                 gotoRevisionId: function( from, to, handles ) {