Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php (revision 23989)
+++ wp-admin/includes/ajax-actions.php (working copy)
@@ -2271,14 +2271,13 @@
if ( ( $compare_two_mode || -1 !== $previous_revision_id ) ) {
$all_the_revisions[] = array (
- 'ID' => $revision->ID,
- 'titleTo' => $revision_date_author,
- 'titleFrom' => $revision_from_date_author,
- 'titleTooltip' => $revision_date_author_short,
- 'restoreLink' => urldecode( $restore_link ),
- 'revision_toload' => true,
- 'previous_revision_id' => $previous_revision_id,
- 'is_current_revision' => $is_current_revision,
+ 'ID' => $revision->ID,
+ 'titleTo' => $revision_date_author,
+ 'titleFrom' => $revision_from_date_author,
+ 'titleTooltip' => $revision_date_author_short,
+ 'restoreLink' => urldecode( $restore_link ),
+ 'previousID' => $previous_revision_id,
+ 'isCurrent' => $is_current_revision,
);
}
$previous_revision_id = $revision->ID;
Index: wp-admin/js/revisions.js
===================================================================
--- wp-admin/js/revisions.js (revision 23989)
+++ wp-admin/js/revisions.js (working copy)
@@ -59,9 +59,9 @@
}
},
- reloadToLoadRevisions: function( models, reverse_direction ) {
+ loadDiffs: function( models ) {
var self = this,
- revisionsToLoad = models.where( { revision_toload: true } ),
+ revisionsToLoad = models.where( { completed: false } ),
delay = 0;
// match slider to passed revision_id
@@ -77,29 +77,29 @@
add: false,
remove: false,
success: function( model ) {
- model.set( 'revision_toload', 'false' );
+ model.set( 'completed', true );
// stop spinner when all models are loaded
- if ( 0 === models.where( { revision_toload: true } ).length )
+ if ( 0 === models.where( { completed: false } ).length )
self.stopModelLoadingSpinner();
self.tickmarkView.render();
- var total_changes = model.get( 'lines_added' ) + model.get( 'lines_deleted'),
- scope_of_changes = 'vsmall';
+ var totalChanges = model.get( 'linesAdded' ) + model.get( 'linesDeleted' ),
+ scopeOfChanges = 'vsmall';
// Note: hard coded scope of changes
// TODO change to dynamic based on range of values
- if ( total_changes > 1 && total_changes <= 3 ) {
- scope_of_changes = 'small';
- } else if( total_changes > 3 && total_changes <= 5 ) {
- scope_of_changes = 'med';
- } else if( total_changes > 5 && total_changes <= 10 ) {
- scope_of_changes = 'large';
- } else if( total_changes > 10 ) {
- scope_of_changes = 'vlarge';
+ if ( totalChanges > 1 && totalChanges <= 3 ) {
+ scopeOfChanges = 'small';
+ } else if ( totalChanges > 3 && totalChanges <= 5 ) {
+ scopeOfChanges = 'med';
+ } else if ( totalChanges > 5 && totalChanges <= 10 ) {
+ scopeOfChanges = 'large';
+ } else if ( totalChanges > 10 ) {
+ scopeOfChanges = 'vlarge';
}
- model.set( 'scope_of_changes', scope_of_changes );
+ model.set( 'scopeOfChanges', scopeOfChanges );
if ( 0 !== self.rightDiff &&
model.get( 'ID' ) === self.revisions.at( self.rightDiff - 1 ).get( 'ID' ) ) {
// reload if current model refreshed
@@ -149,19 +149,19 @@
reloadModelSingle: function() {
var self = this;
- // TODO: Only updates the query args yet
+ self.startRightModelLoading();
+
self.revisions.reload({
+ options: {
'showAutosaves': self.autosaves,
'showSplitView': self.showSplitView
- });
+ },
- self.startRightModelLoading();
- self.revisions.fetch({ // reload revision data
success: function() {
var revisionCount = self.revisions.length;
self.revisionView.model = self.revisions;
self.revisionView.render();
- self.reloadToLoadRevisions( self.revisions );
+ self.loadDiffs( self.revisions );
self.tickmarkView.model = self.revisions;
self.tickmarkView.render();
self.slider.refresh({
@@ -173,7 +173,6 @@
error: function() {
self.stopRightModelLoading();
}
-
});
},
@@ -191,7 +190,7 @@
self.leftHandleRevisions.fetch({
success: function(){
self.stopLeftModelLoading();
- self.reloadToLoadRevisions( self.leftHandleRevisions );
+ self.loadDiffs( self.leftHandleRevisions );
self.tickmarkView.model = self.leftHandleRevisions;
self.slider.refresh({
'max': self.revisions.length
@@ -222,7 +221,7 @@
self.rightHandleRevisions.fetch({
success: function(){
self.stopRightModelLoading();
- self.reloadToLoadRevisions( self.rightHandleRevisions );
+ self.loadDiffs( self.rightHandleRevisions );
self.tickmarkView.model = self.rightHandleRevisions;
self.slider.refresh({
'max': self.revisions.length,
@@ -250,7 +249,7 @@
});
this.revisionView.render();
- this.reloadToLoadRevisions( this.revisions );
+ this.loadDiffs( this.revisions );
this.revisionsInteractions = new revisions.view.Interact({
model: this.revisions
@@ -262,7 +261,6 @@
});
this.tickmarkView.render();
this.tickmarkView.resetTicks();
-
}
});
@@ -633,7 +631,7 @@
this.toggleCompareTwoCheckbox();
// hide the restore button when on the last sport/current post data
- $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'is_current_revision' ) );
+ $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'isCurrent' ) );
return this;
},
@@ -686,8 +684,7 @@
*/
Revision = revisions.model.Revision = Backbone.Model.extend({
idAttribute: 'ID',
- urlRoot: ajaxurl + '?action=revisions-data' +
- '&show_autosaves=true&show_split_view=true&nonce=' + revisions.model.settings.nonce,
+
defaults: {
ID: 0,
titleTo: '',
@@ -695,19 +692,23 @@
titleFrom: '',
diff: '',
restoreLink: '',
- revision_toload: false,
- lines_added: 0,
- lines_deleted: 0,
- scope_of_changes: 'none',
- previous_revision_id: 0,
- is_current_revision: false
+ completed: false,
+ linesAdded: 0,
+ linesDeleted: 0,
+ scopeOfChanges: 'none',
+ previousID: 0,
+ isCurrent: false
},
url: function() {
if ( Diff.singleRevision ) {
- return this.urlRoot +
+ return ajaxurl +
+ '?action=revisions-data' +
+ '&show_autosaves=true' +
+ '&show_split_view=true' +
+ '&nonce=' + revisions.model.settings.nonce +
'&single_revision_id=' + this.id +
- '&compare_to=' + this.get( 'previous_revision_id' ) +
+ '&compare_to=' + this.get( 'previousID' ) +
'&post_id=' + revisions.model.settings.post_id;
} else {
return this.collection.url() + '&single_revision_id=' + this.id;
@@ -721,7 +722,6 @@
*/
Revisions = revisions.Revisions = Backbone.Collection.extend({
model: Revision,
- urlRoot: ajaxurl + '?action=revisions-data',
initialize: function( models, options ) {
this.options = _.defaults( options || {}, {
@@ -736,7 +736,8 @@
},
url: function() {
- return this.urlRoot +
+ return ajaxurl +
+ '?action=revisions-data' +
'&compare_to=' + this.options.compareTo +
'&post_id=' + this.options.post_id +
'&show_autosaves=' + this.options.showAutosaves +
@@ -747,10 +748,12 @@
},
reload: function( options ) {
- this.options = _.defaults( options || {}, this.options );
+ this.options = _.defaults( options.options || {}, this.options );
- // TODO
- //this.fetch();
+ this.fetch({
+ success: options.success || null,
+ error: options.error || null
+ });
}
} );
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css (revision 23989)
+++ wp-admin/css/colors-fresh.css (working copy)
@@ -1387,14 +1387,14 @@
background-color: #f7f7f7;
}
-.revision-tick.loading-true {
+.revision-tick.completed-false {
background-color: #9999cc;
background: url(../images/wpspin_light.gif) no-repeat;
background-position: middle;
background-size: 1px 10px;
}
-.revision-tick.loading-false {
+.revision-tick.completed-true {
background-color: #aaa;
}
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css (revision 23989)
+++ wp-admin/css/colors-classic.css (working copy)
@@ -1484,14 +1484,14 @@
color: #0080aa;
}
-.revision-tick.loading-true {
+.revision-tick.completed-false {
background-color: #9999cc;
background: url(../images/wpspin_light.gif) no-repeat;
background-position: middle;
background-size: 1px 10px;
}
-.revision-tick.loading-false {
+.revision-tick.completed-true {
background-color: #aaa;
}
Index: wp-admin/revision.php
===================================================================
--- wp-admin/revision.php (revision 23989)
+++ wp-admin/revision.php (working copy)
@@ -163,7 +163,7 @@