Changeset 24622

Timestamp:

07/10/2013 03:20:58 AM (13 years ago)

Author:

markjaquith

Message:

Don't call updateDiff() in the Revisions FrameState model.

• Stuff needs to hook in, so firing it early results in a half-rendered screen.
• updateDiff() now returns a promise.
• Now, in the frame view's render(), it calls updateDiff(), relying on its promise.

See #24425.

File:

• trunk/wp-admin/js/revisions.js (modified) (5 diffs)

trunk/wp-admin/js/revisions.js

@@ -260 +260 @@
                         this.listenTo( this, 'update:revisions', this.loadSurrounding );
                         this.listenTo( this, 'change:compareTwoMode', this.changedMode );
-                        this.updateDiff({ immediate: true });
                 },
 
@@ -301 +300 @@
                         // Check if we're actually changing the diff id.
                         if ( this._diffId === diffId )
-                                return;
+                                return $.Deferred().fail().promise();
 
                         this._diffId = diffId;
@@ -310 +309 @@
                         if ( diff ) {
                                 this.trigger( 'update:diff', diff );
-
+                                return $.Deferred().resolve().promise();
                         // Otherwise, fetch the diff.
                         } else {
-                                if ( options.immediate )
-                                        this._ensureDiff();
-                                else
+                                if ( options.immediate ) {
+                                        return this._ensureDiff();
+                                } else {
                                         this._debouncedEnsureDiff();
+                                        return $.Deferred().fail().promise();
+                                }
                         }
                 },
@@ -327 +328 @@
 
                 _ensureDiff: function() {
-                        this.diffs.ensure( this._diffId, this ).done( function( diff ) {
+                        return this.diffs.ensure( this._diffId, this ).done( function( diff ) {
                                 // Make sure the current diff didn't change while the request was in flight.
                                 if ( this._diffId === diff.id )
@@ -362 +363 @@
 
                 render: function() {
-                        wp.Backbone.View.prototype.render.apply( this, arguments );
-
-                        $('#wpbody-content .wrap').append( this.el );
-                        this.views.ready();
+                        this.model.updateDiff({ immediate: true }).done( _.bind( function() {
+                                wp.Backbone.View.prototype.render.apply( this, arguments );
+
+                                $('#wpbody-content .wrap').append( this.el );
+                                this.views.ready();
+                        }, this ) );
 
                         return this;