Ticket #24056: 24056.2.patch
File 24056.2.patch, 3.9 KB (added by , 12 years ago) |
---|
-
wp-admin/includes/ajax-actions.php
2117 2117 $right_handle_at = ! empty( $_GET['right_handle_at'] ) ? (int) $_GET['right_handle_at'] : 0; 2118 2118 $left_handle_at = ! empty( $_GET['left_handle_at'] ) ? (int) $_GET['left_handle_at'] : 0; 2119 2119 $single_revision_id = ! empty( $_GET['single_revision_id'] ) ? absint( $_GET['single_revision_id'] ) : 0; 2120 $page_size = ! empty( $_GET['page_size'] ) ? absint( $_GET['page_size'] ) : -1; 2121 $page = ! empty( $_GET['page'] ) ? absint( $_GET['page'] ) : 1; 2120 2122 $compare_two_mode = (bool) $post_id; 2121 2123 2122 2124 // … … 2131 2133 if ( ! current_user_can( 'read_post', $post_id ) ) 2132 2134 continue; 2133 2135 2134 if ( ! $revisions = wp_get_post_revisions( $post_id ) )2136 if ( ! $revisions = wp_get_post_revisions( $post_id, array( 'posts_per_page' => $page_size, 'paged' => $page ) ) ) 2135 2137 return; 2136 2138 2137 2139 $left_revision = get_post( $compare_to ); -
wp-admin/js/revisions.js
142 142 }, 143 143 144 144 // load the models for the single handle mode 145 reloadModelSingle: function( ) {145 reloadModelSingle: function( options ) { 146 146 var self = this; 147 148 options = _.defaults( options || {}, { 149 'showAutosaves': self.autosaves, 150 'showSplitView': self.showSplitView 151 }); 147 152 148 153 self.startRightModelLoading(); 149 154 150 155 self.revisions.reload({ 151 options: { 152 'showAutosaves': self.autosaves, 153 'showSplitView': self.showSplitView 154 }, 156 options: options, 155 157 156 158 success: function() { 157 159 var revisionCount = self.revisions.length; … … 540 542 // next and previous buttons, only available in compare one mode 541 543 events: { 542 544 'click #next': 'nextRevision', 543 'click #previous': 'previousRevision' 545 'click #previous': 'previousRevision', 546 'click .paginate': 'changePage' 544 547 }, 545 548 546 549 render: function() { … … 600 603 Diff.slider.refresh({ 601 604 value: Diff.rightDiff - 1 602 605 }, true ); 606 }, 607 608 changePage: function(e) { 609 $( '.paginate' ).removeClass( 'button-disabled' ); 610 $( e.currentTarget ).addClass( 'button-disabled' ); 611 612 Diff.reloadModelSingle({ 613 'page' : $( e.currentTarget ).data( 'id' ) 614 }); 603 615 } 604 616 }); 605 617 … … 751 763 'showSplitView': true, 752 764 'rightHandleAt': 0, 753 765 'leftHandleAt': 0, 766 'page_size' : revisions.model.settings.page_size, 767 'page' : 1, 754 768 'nonce': revisions.model.settings.nonce 755 769 }); 756 770 }, … … 764 778 '&show_split_view=' + this.options.showSplitView + 765 779 '&right_handle_at=' + this.options.rightHandleAt + 766 780 '&left_handle_at=' + this.options.leftHandleAt + 781 '&page_size=' + this.options.page_size + 782 '&page=' + this.options.page + 767 783 '&nonce=' + this.options.nonce; 768 784 }, 769 785 -
wp-admin/revision.php
82 82 $settings = array( 83 83 'post_id' => $post->ID, 84 84 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ), 85 'revision_id' => $revision_id 85 'revision_id' => $revision_id, 86 'page_size' => 5 86 87 ); 87 88 88 89 wp_localize_script( 'revisions', 'wpRevisionsSettings', $settings ); … … 170 171 </div> 171 172 172 173 <div id="diff-slider" class="wp-slider"></div> 174 175 <div id="diff-paginate" style="text-align: center; margin: 5px 0 0 0;"> 176 <?php 177 $pages = count( wp_get_post_revisions( $post->ID ) ) / $settings['page_size']; 178 for( $i = 1; $i <= $pages; $i++ ) 179 echo '<input class="button'.($i==1 ? ' button-disabled' : '').' paginate" type="button" value="'.$i.'" data-id="'.$i.'" />'; 180 ?> 181 </div> 173 182 </script> 174 183 175 184 <script id="tmpl-revision-ticks" type="text/html">