Changeset 30131

Timestamp:

11/01/2014 12:38:21 AM (12 years ago)

Author:

wonderboymusic

Message:

Revisions modules should not rely on global settings:

• Only pass in global settings on init, this allows the classes to be used agnostically elsewhere
• Clean up some erroneous/weird Backbone syntax

Props ericlewis, wonderboymusic.
Fixes #30219.

File:

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

trunk/src/wp-admin/js/revisions.js

@@ -49 +49 @@
                 });
         };
-
-        // wp_localize_script transforms top-level numbers into strings. Undo that.
-        if ( revisions.settings.to ) {
-                revisions.settings.to = parseInt( revisions.settings.to, 10 );
-        }
-        if ( revisions.settings.from ) {
-                revisions.settings.from = parseInt( revisions.settings.from, 10 );
-        }
-
-        // wp_localize_script does not allow for top-level booleans. Fix that.
-        if ( revisions.settings.compareTwoMode ) {
-                revisions.settings.compareTwoMode = revisions.settings.compareTwoMode === '1';
-        }
 
         /**
@@ -88 +75 @@
 
                         // Listen for internal changes
-                        this.listenTo( this, 'change:from', this.handleLocalChanges );
-                        this.listenTo( this, 'change:to', this.handleLocalChanges );
-                        this.listenTo( this, 'change:compareTwoMode', this.updateSliderSettings );
-                        this.listenTo( this, 'update:revisions', this.updateSliderSettings );
+                        this.on( 'change:from', this.handleLocalChanges );
+                        this.on( 'change:to', this.handleLocalChanges );
+                        this.on( 'change:compareTwoMode', this.updateSliderSettings );
+                        this.on( 'update:revisions', this.updateSliderSettings );
 
                         // Listen for changes to the hovered revision
-                        this.listenTo( this, 'change:hoveredRevision', this.hoverRevision );
+                        this.on( 'change:hoveredRevision', this.hoverRevision );
 
                         this.set({
@@ -243 +230 @@
                         this.loadAll = _.once( this._loadAll );
                         this.revisions = options.revisions;
+                        this.postId = options.postId;
                         this.requests  = {};
                 },
@@ -340 +328 @@
                                 options.data = _.extend( options.data || {}, {
                                         action: 'get-revision-diffs',
-                                        post_id: revisions.settings.postId
+                                        post_id: this.postId
                                 });
 
@@ -391 +379 @@
 
                 initialize: function( attributes, options ) {
-                        var properties = {};
-
+                        var state = this.get( 'initialDiffState' );
                         _.bindAll( this, 'receiveDiff' );
                         this._debouncedEnsureDiff = _.debounce( this._ensureDiff, 200 );
 
                         this.revisions = options.revisions;
-                        this.diffs = new revisions.model.Diffs( [], { revisions: this.revisions });
-
-                        // Set the initial diffs collection provided through the settings
-                        this.diffs.set( revisions.settings.diffData );
+
+                        this.diffs = new revisions.model.Diffs( [], {
+                                revisions: this.revisions,
+                                postId: this.get( 'postId' )
+                        } );
+
+                        // Set the initial diffs collection.
+                        this.diffs.set( this.get( 'diffData' ) );
 
                         // Set up internal listeners
@@ -410 +401 @@
                         this.listenTo( this, 'update:diff', this.updateLoadingStatus );
 
-                        // Set the initial revisions, baseUrl, and mode as provided through settings
-                        properties.to = this.revisions.get( revisions.settings.to );
-                        properties.from = this.revisions.get( revisions.settings.from );
-                        properties.compareTwoMode = revisions.settings.compareTwoMode;
-                        properties.baseUrl = revisions.settings.baseUrl;
-                        this.set( properties );
+                        // Set the initial revisions, baseUrl, and mode as provided through attributes.
+
+                        this.set( {
+                                to : this.revisions.get( state.to ),
+                                from : this.revisions.get( state.from ),
+                                compareTwoMode : this.revisions.get( state.compareTwoMode )
+                        } );
 
                         // Start the router if browser supports History API
@@ -1144 +1136 @@
          */
         revisions.init = function() {
+                var state;
+
                 // Bail if the current page is not revision.php.
                 if ( ! window.adminpage || 'revision-php' !== window.adminpage ) {
@@ -1149 +1143 @@
                 }
 
+                state = new revisions.model.FrameState({
+                        initialDiffState: {
+                                // wp_localize_script doesn't stringifies ints, so cast them.
+                                to: parseInt( revisions.settings.to, 10 ),
+                                from: parseInt( revisions.settings.from, 10 ),
+                                // wp_localize_script does not allow for top-level booleans so do a comparator here.
+                                compareTwoMode: ( revisions.settings.compareTwoMode === '1' )
+                        },
+                        diffData: revisions.settings.diffData,
+                        baseUrl: revisions.settings.baseUrl,
+                        postId: parseInt( revisions.settings.postId, 10 )
+                }, {
+                        revisions: new revisions.model.Revisions( revisions.settings.revisionData )
+                });
+
                 revisions.view.frame = new revisions.view.Frame({
-                        model: new revisions.model.FrameState({}, {
-                                revisions: new revisions.model.Revisions( revisions.settings.revisionData )
-                        })
+                        model: state
                 }).render();
         };