From 15df489ecd9d43dd37a5f2025a627667bdb8aff5 Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Tue, 9 Jul 2013 07:55:50 +0000 Subject: [PATCH] Revisions: Reduce points where IDs are cast in JS. See #24425. git-svn-id: https://develop.svn.wordpress.org/trunk@24605 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/revision.php | 2 +- wp-admin/js/revisions.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php index c64fa416e9..e877c9e005 100644 --- a/wp-admin/includes/revision.php +++ b/wp-admin/includes/revision.php @@ -101,6 +101,6 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id ) { 'postId' => $post->ID, 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ), 'revisionData' => array_values( $revisions ), - 'selectedRevision' => $selected_revision_id, + 'selectedRevision' => (int) $selected_revision_id, ); } diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js index fa2e84d61c..afb7635a62 100644 --- a/wp-admin/js/revisions.js +++ b/wp-admin/js/revisions.js @@ -554,7 +554,7 @@ window.wp = window.wp || {}; // 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: revisions.settings.selectedRevision }) ); this.settings = new revisions.model.Slider({ max: latestRevisionIndex, @@ -568,7 +568,7 @@ window.wp = window.wp || {}; 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.model.revisions.findWhere({ id: revisions.settings.selectedRevision }) ); // And update the slider in case the route has set it. this.updateSliderSettings(); @@ -819,11 +819,14 @@ window.wp = window.wp || {}; }, 250 ), 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({ to: selectedToRevision,