Changeset 24605

Timestamp:

07/09/2013 07:55:50 AM (13 years ago)

Author:

koopersmith

Message:

Revisions: Reduce points where IDs are cast in JS. See #24425.

Location:

trunk/wp-admin

Files:

• includes/revision.php (modified) (1 diff)
• js/revisions.js (modified) (3 diffs)

trunk/wp-admin/includes/revision.php

@@ -102 +102 @@
                 'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
                 'revisionData'     => array_values( $revisions ),
-                'selectedRevision' => $selected_revision_id,
+                'selectedRevision' => (int) $selected_revision_id,
         );
 }

trunk/wp-admin/js/revisions.js

@@ -555 +555 @@
                         var initiallySelectedRevisionIndex =
                                 this.model.revisions.indexOf(
-                                        this.model.revisions.findWhere({ id: Number( revisions.settings.selectedRevision ) }) );
+                                        this.model.revisions.findWhere({ id: revisions.settings.selectedRevision }) );
 
                         this.settings = new revisions.model.Slider({
@@ -569 +569 @@
                         // 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.model.revisions.findWhere({ id: revisions.settings.selectedRevision }) );
 
                         // And update the slider in case the route has set it.
@@ -820 +820 @@
 
                 gotoRevisionId: function( from, to, handles ) {
-                        this.model.set( { compareTwoMode: ( '2' === handles ) } );
+                        from = parseInt( from, 10 );
+                        to = parseInt( to, 10 );
+
+                        this.model.set({ compareTwoMode: ( '2' === handles ) });
 
                         if ( 'undefined' !== typeof this.model ) {
-                                var selectedToRevision = this.model.revisions.findWhere({ 'id': Number( to ) }),
-                                        selectedFromRevision = this.model.revisions.findWhere({ 'id': Number( from ) });
+                                var selectedToRevision = this.model.revisions.findWhere({ id: to }),
+                                        selectedFromRevision = this.model.revisions.findWhere({ id: from });
 
                                 this.model.set({