vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-06 23:58:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revisions: Fix PHP loading of comparison to first revision, and premature rendering of tooltip.

Browse Source 
Props aaroncampbell, markjaquith. Fixes #24873 for trunk.

git-svn-id: https://develop.svn.wordpress.org/trunk@24864 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith
2013-07-29 17:26:03 +00:00
parent 241ca959be
commit 7c99f40451
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/js/revisions.js
+6 -5
View File
@@ -155,8 +155,6 @@ window.wp = window.wp || {};
this.listenTo( this.slider, 'hovered:revision', this.updateRevision );
this.listenTo( this.slider, 'change:hovering', this.setHovering );
this.listenTo( this.slider, 'change:scrubbing', this.setScrubbing );
this.set({ revision: this.revisions.get( this.frame.get('to') ) });
},
@@ -754,9 +752,12 @@ window.wp = window.wp || {};
},
prepare: function() {
return _.extend( { type: 'tooltip' }, {
attributes: this.model.get('revision').toJSON()
});
if ( _.isNull( this.model.get('revision') ) )
return;
else
return _.extend( { type: 'tooltip' }, {
attributes: this.model.get('revision').toJSON()
});
},
render: function() {