Revisions: A healthy dose of pinking shears. See #24425.
git-svn-id: http://core.svn.wordpress.org/trunk@24603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
764bc6d6c8
commit
5c10250187
|
@ -232,7 +232,6 @@ window.wp = window.wp || {};
|
|||
});
|
||||
|
||||
this.listenTo( this.model, 'change:diffId', this.updateDiff );
|
||||
|
||||
this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
|
||||
|
||||
this.views.set( '.revisions-control-frame', new revisions.view.Controls({
|
||||
|
@ -269,9 +268,11 @@ window.wp = window.wp || {};
|
|||
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({
|
||||
model: diff
|
||||
}) );
|
||||
|
||||
this.model.trigger('renderDiff');
|
||||
});
|
||||
},
|
||||
|
@ -822,14 +823,13 @@ window.wp = window.wp || {};
|
|||
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': Number( to ) }),
|
||||
selectedFromRevision = this.model.revisions.findWhere({ 'id': Number( from ) });
|
||||
|
||||
this.model.set({
|
||||
to: selectedToRevision,
|
||||
from: selectedFromRevision } );
|
||||
from: selectedFromRevision
|
||||
});
|
||||
}
|
||||
revisions.settings.selectedRevision = to;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue