WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revisions: Move data management into the frame state. See #24425. 

This helps to solidify the separation between data and UI. We track the diffId internally now, as the property itself was never referenced, and was always derived from the 'from' and 'to' models. This also sets us up for better request debouncing and diff management.



git-svn-id: http://core.svn.wordpress.org/trunk@24609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2013-07-09 08:50:32 +00:00
parent 803dc4a79e
commit 874d93f7b8
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
wp-admin/js/revisions.js
View File

@ -209,8 +209,26 @@ window.wp = window.wp || {};
// will only be updated once. This is because Backbone updates all of // will only be updated once. This is because Backbone updates all of
// the changed attributes in `set`, and then fires the `change` events. // the changed attributes in `set`, and then fires the `change` events.
updateDiff: function() { updateDiff: function() {
var from = this.get('from'); var from, to, diffId;
this.set( 'diffId', (from ? from.id : '0' ) + ':' + this.get('to').id );
from = this.get('from');
to = this.get('to');
diffId = ( from ? from.id : 0 ) + ':' + to.id;
// Check if we're actually changing the diff id.
if ( this._diffId === diffId )
return;
this._diffId = diffId;
this.trigger( 'update:revisions', from, to );
this.diffs.ensure( diffId, this ).done( function( diff ) {
// Check if the current diff changed while the request was in flight.
if ( this._diffId !== diff.id )
return;
this.trigger( 'update:diff', diff );
});
} }
}); });
@ -231,7 +249,7 @@ window.wp = window.wp || {};
revisions: this.collection revisions: this.collection
}); });
this.listenTo( this.model, 'change:diffId', this.updateDiff ); this.listenTo( this.model, 'update:diff', this.renderDiff );
this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode ); this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
this.views.set( '.revisions-control-frame', new revisions.view.Controls({ this.views.set( '.revisions-control-frame', new revisions.view.Controls({
@ -264,17 +282,10 @@ window.wp = window.wp || {};
return this; return this;
}, },
updateDiff: function() { renderDiff: function( diff ) {
this.model.diffs.ensure( this.model.get('diffId'), this ).done( function( diff ) {
if ( this.model.get('diffId') !== diff.id )
return;
this.views.set( '.revisions-diff-frame', new revisions.view.Diff({ this.views.set( '.revisions-diff-frame', new revisions.view.Diff({
model: diff model: diff
}) ); }) );
this.model.trigger('renderDiff');
});
}, },
updateCompareTwoMode: function() { updateCompareTwoMode: function() {
@ -364,7 +375,7 @@ window.wp = window.wp || {};
}, },
initialize: function() { initialize: function() {
this.listenTo( this.model, 'change:diffId', this.updateMeta ); this.listenTo( this.model, 'update:revisions', this.updateMeta );
}, },
restoreRevision: function() { restoreRevision: function() {
@ -372,10 +383,10 @@ window.wp = window.wp || {};
document.location = restoreUrl; document.location = restoreUrl;
}, },
updateMeta: function() { updateMeta: function( from, to ) {
this.$el.html( this.template( this.model.toJSON() ) ); this.$el.html( this.template( this.model.toJSON() ) );
$('#restore-revision').prop( 'disabled', this.model.get('to').attributes.current ); $('#restore-revision').prop( 'disabled', to.attributes.current );
} }
}); });
@ -481,7 +492,7 @@ window.wp = window.wp || {};
}, },
ready: function() { ready: function() {
this.listenTo( this.model, 'change:diffId', this.disabledButtonCheck ); this.listenTo( this.model, 'update:revisions', this.disabledButtonCheck );
}, },
// Go to a specific modelindex, taking into account RTL mode. // Go to a specific modelindex, taking into account RTL mode.
@ -582,8 +593,8 @@ window.wp = window.wp || {};
this.updateSliderSettings(); this.updateSliderSettings();
}, this ); }, this );
// Listen for changes in the diffId // Listen for changes to the revisions
this.listenTo( this.model, 'change:diffId', this.diffIdChanged ); this.listenTo( this.model, 'update:revisions', this.updateRevisions );
}, },
mousemove: function( e ) { mousemove: function( e ) {
@ -672,15 +683,15 @@ window.wp = window.wp || {};
} }
}, },
diffIdChanged: function() { updateRevisions: function( from, to ) {
// Reset the view settings when diffId is changed // Update the view settings when the revisions have changed.
if ( this.model.get('compareTwoMode') ) { if ( this.model.get('compareTwoMode') ) {
this.settings.set({ 'values': [ this.settings.set({ 'values': [
this.model.revisions.indexOf( this.model.get('from') ), this.model.revisions.indexOf( from ),
this.model.revisions.indexOf( this.model.get('to') ) this.model.revisions.indexOf( to )
] }); ] });
} else { } else {
this.settings.set({ 'value': this.model.revisions.indexOf( this.model.get('to') ) }); this.settings.set({ 'value': this.model.revisions.indexOf( to ) });
} }
}, },