From 6af2febb37374360f72bce66761a76c1b2fbe76a Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 12 Jul 2013 05:11:50 +0000 Subject: [PATCH] Revisions: use `reject()`, not `fail()`, when rejecting a deferred. See #24425. git-svn-id: http://core.svn.wordpress.org/trunk@24666 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/revisions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js index 2003e5e090..d88c8450df 100644 --- a/wp-admin/js/revisions.js +++ b/wp-admin/js/revisions.js @@ -320,6 +320,7 @@ window.wp = window.wp || {}; revisions.model.FrameState = Backbone.Model.extend({ defaults: { + loading: false, compareTwoMode: false }, @@ -391,7 +392,7 @@ window.wp = window.wp || {}; // Check if we're actually changing the diff id. if ( this._diffId === diffId ) - return $.Deferred().fail().promise(); + return $.Deferred().reject().promise(); this._diffId = diffId; this.trigger( 'update:revisions', from, to ); @@ -407,7 +408,7 @@ window.wp = window.wp || {}; return this._ensureDiff(); } else { this._debouncedEnsureDiff(); - return $.Deferred().fail().promise(); + return $.Deferred().reject().promise(); } } },