Changeset 24609

Timestamp:

07/09/2013 08:50:32 AM (13 years ago)

Author:

koopersmith

Message:

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.

File:

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

trunk/wp-admin/js/revisions.js

@@ -210 +210 @@
                 // the changed attributes in `set`, and then fires the `change` events.
                 updateDiff: function() {
-                        var from = this.get('from');
-                        this.set( 'diffId', (from ? from.id : '0' ) + ':' + this.get('to').id );
+                        var from, to, diffId;
+
+                        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 );
+                        });
                 }
         });
@@ -232 +250 @@
                         });
 
-                        this.listenTo( this.model, 'change:diffId', this.updateDiff );
+                        this.listenTo( this.model, 'update:diff', this.renderDiff );
                         this.listenTo( this.model, 'change:compareTwoMode', this.updateCompareTwoMode );
 
@@ -265 +283 @@
                 },
 
-                updateDiff: function() {
-                        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');
-                        });
+                renderDiff: function( diff ) {
+                        this.views.set( '.revisions-diff-frame', new revisions.view.Diff({
+                                model: diff
+                        }) );
                 },
 
@@ -365 +376 @@
 
                 initialize: function() {
-                        this.listenTo( this.model, 'change:diffId', this.updateMeta );
+                        this.listenTo( this.model, 'update:revisions', this.updateMeta );
                 },
 
@@ -373 +384 @@
                 },
 
-                updateMeta: function() {
+                updateMeta: function( from, to ) {
                         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 );
                 }
         });
@@ -482 +493 @@
 
                 ready: function() {
-                        this.listenTo( this.model, 'change:diffId', this.disabledButtonCheck );
+                        this.listenTo( this.model, 'update:revisions', this.disabledButtonCheck );
                 },
 
@@ -583 +594 @@
                         }, this );
 
-                        // Listen for changes in the diffId
-                        this.listenTo( this.model, 'change:diffId', this.diffIdChanged );
+                        // Listen for changes to the revisions
+                        this.listenTo( this.model, 'update:revisions', this.updateRevisions );
                 },
 
@@ -673 +684 @@
                 },
 
-                diffIdChanged: function() {
-                        // Reset the view settings when diffId is changed
+                updateRevisions: function( from, to ) {
+                        // Update the view settings when the revisions have changed.
                         if ( this.model.get('compareTwoMode') ) {
                                 this.settings.set({ 'values': [
-                                        this.model.revisions.indexOf( this.model.get('from') ),
-                                        this.model.revisions.indexOf( this.model.get('to') )
+                                        this.model.revisions.indexOf( from ),
+                                        this.model.revisions.indexOf( to )
                                 ] });
                         } else {
-                                this.settings.set({ 'value': this.model.revisions.indexOf( this.model.get('to') ) });
+                                this.settings.set({ 'value': this.model.revisions.indexOf( to ) });
                         }
                 },