Changeset 24019

Timestamp:

04/17/2013 07:34:21 PM (12 years ago)

Author:

ocean90

Message:

Revisions: Clean up JavaScript variable names, see #23901.

Location:

trunk/wp-admin

Files:

• css/colors-classic.css (modified) (2 diffs)
• css/colors-fresh.css (modified) (2 diffs)
• includes/ajax-actions.php (modified) (2 diffs)
• js/revisions.js (modified) (16 diffs)
• revision.php (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -1484 +1484 @@
 }
 
-.revision-tick.loading-true {
+.revision-tick.completed-false {
     background-color: #9999cc;
     background: url(../images/wpspin_light.gif) no-repeat;
@@ -1491 +1491 @@
 }
 
-.revision-tick.loading-false {
+.revision-tick.completed-true {
     background-color: #aaa;
 }

trunk/wp-admin/css/colors-fresh.css

@@ -1378 +1378 @@
 }
 
-.revision-tick.loading-true {
+.revision-tick.completed-false {
     background-color: #9999cc;
     background: url(../images/wpspin_light.gif) no-repeat;
@@ -1385 +1385 @@
 }
 
-.revision-tick.loading-false {
+.revision-tick.completed-true {
     background-color: #aaa;
 }

trunk/wp-admin/includes/ajax-actions.php

@@ -2165 +2165 @@
         $all_the_revisions = array (
             'diff'          => $content,
-            'lines_deleted' => $lines_deleted,
-            'lines_added'   => $lines_added
+            'linesDeleted' => $lines_deleted,
+            'linesAdded'   => $lines_added
         );
 
@@ -2274 +2274 @@
         if ( ( $compare_two_mode || -1 !== $previous_revision_id ) ) {
             $all_the_revisions[] = array (
-                'ID'                   => $revision->ID,
-                'titleTo'              => $revision_date_author,
-                'titleFrom'            => $revision_from_date_author,
-                'titleTooltip'         => $revision_date_author_short,
-                'restoreLink'          => urldecode( $restore_link ),
-                'revision_toload'      => true,
-                'previous_revision_id' => $previous_revision_id,
-                'is_current_revision'  => $is_current_revision,
+                'ID'           => $revision->ID,
+                'titleTo'      => $revision_date_author,
+                'titleFrom'    => $revision_from_date_author,
+                'titleTooltip' => $revision_date_author_short,
+                'restoreLink'  => urldecode( $restore_link ),
+                'previousID'   => $previous_revision_id,
+                'isCurrent'    => $is_current_revision,
             );
         }

trunk/wp-admin/js/revisions.js

@@ -60 +60 @@
         },
 
-        reloadToLoadRevisions: function( models, reverse_direction ) {
+        loadDiffs: function( models ) {
             var self = this,
-                revisionsToLoad = models.where( { revision_toload: true } ),
+                revisionsToLoad = models.where( { completed: false } ),
                 delay = 0;
 
@@ -78 +78 @@
                             remove: false,
                             success: function( model ) {
-                                model.set( 'revision_toload', 'false' );
+                                model.set( 'completed', true );
 
                                 // stop spinner when all models are loaded
-                                if ( 0 === models.where( { revision_toload: true } ).length )
+                                if ( 0 === models.where( { completed: false } ).length )
                                     self.stopModelLoadingSpinner();
 
                                 self.tickmarkView.render();
 
-                                var total_changes = model.get( 'lines_added' ) + model.get( 'lines_deleted'),
-                                    scope_of_changes = 'vsmall';
+                                var totalChanges = model.get( 'linesAdded' ) + model.get( 'linesDeleted' ),
+                                    scopeOfChanges = 'vsmall';
 
                                 // Note: hard coded scope of changes
                                 // TODO change to dynamic based on range of values
-                                if  ( total_changes > 1 && total_changes <= 3 ) {
-                                    scope_of_changes = 'small';
-                                } else if( total_changes > 3 && total_changes <= 5 ) {
-                                    scope_of_changes = 'med';
-                                } else if( total_changes > 5 && total_changes <= 10 ) {
-                                    scope_of_changes = 'large';
-                                } else if( total_changes > 10 ) {
-                                    scope_of_changes = 'vlarge';
+                                if ( totalChanges > 1 && totalChanges <= 3 ) {
+                                    scopeOfChanges = 'small';
+                                } else if ( totalChanges > 3 && totalChanges <= 5 ) {
+                                    scopeOfChanges = 'med';
+                                } else if ( totalChanges > 5 && totalChanges <= 10 ) {
+                                    scopeOfChanges = 'large';
+                                } else if ( totalChanges > 10 ) {
+                                    scopeOfChanges = 'vlarge';
                                 }
-                                model.set( 'scope_of_changes', scope_of_changes );
+                                model.set( 'scopeOfChanges', scopeOfChanges );
                                 if ( 0 !== self.rightDiff &&
                                     model.get( 'ID' ) === self.revisions.at( self.rightDiff - 1 ).get( 'ID' ) ) {
@@ -150 +150 @@
             var self = this;
 
-            // TODO: Only updates the query args yet
+            self.startRightModelLoading();
+
             self.revisions.reload({
+                options: {
                 'showAutosaves': self.autosaves,
                 'showSplitView': self.showSplitView
-            });
-
-            self.startRightModelLoading();
-            self.revisions.fetch({ // reload revision data
+                },
+
                 success: function() {
                     var revisionCount = self.revisions.length;
                     self.revisionView.model = self.revisions;
                     self.revisionView.render();
-                    self.reloadToLoadRevisions( self.revisions );
+                    self.loadDiffs( self.revisions );
                     self.tickmarkView.model = self.revisions;
                     self.tickmarkView.render();
@@ -174 +174 @@
                     self.stopRightModelLoading();
                 }
-
             });
         },
@@ -192 +191 @@
                 success: function(){
                     self.stopLeftModelLoading();
-                    self.reloadToLoadRevisions( self.leftHandleRevisions );
+                    self.loadDiffs( self.leftHandleRevisions );
                     self.tickmarkView.model = self.leftHandleRevisions;
                     self.slider.refresh({
@@ -223 +222 @@
                 success: function(){
                     self.stopRightModelLoading();
-                    self.reloadToLoadRevisions( self.rightHandleRevisions );
+                    self.loadDiffs( self.rightHandleRevisions );
                     self.tickmarkView.model = self.rightHandleRevisions;
                     self.slider.refresh({
@@ -251 +250 @@
             this.revisionView.render();
 
-            this.reloadToLoadRevisions( this.revisions );
+            this.loadDiffs( this.revisions );
 
             this.revisionsInteractions = new revisions.view.Interact({
@@ -263 +262 @@
             this.tickmarkView.render();
             this.tickmarkView.resetTicks();
-
         }
     });
@@ -450 +448 @@
 
         resetTicks: function() {
-            var sliderMax = Diff.slider.option( 'max' );
+            var sliderMax   = Diff.slider.option( 'max' );
             var sliderWidth = Diff.slider.width();
-            var adjustMax = Diff.singleRevision ? 0 : 1;
-            var tickWidth = Math.floor( sliderWidth / ( sliderMax - adjustMax ) );
+            var adjustMax   = Diff.singleRevision ? 0 : 1;
+            var tickWidth   = Math.floor( sliderWidth / ( sliderMax - adjustMax ) );
 
             // TODO: adjust right margins for wider ticks so they stay centered on handle stop point
@@ -474 +472 @@
                 });
 
-                if( ! Diff.singleRevision ) {
-                    $( '.revision-tick' ).first().remove(); // TODO - remove the check
-                }
                 $( '.revision-tick' ).last().css( 'margin-right', '0' ); // last tick gets no right margin
             }
@@ -634 +629 @@
 
             // hide the restore button when on the last sport/current post data
-            $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'is_current_revision' ) );
+            $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'isCurrent' ) );
 
             return this;
@@ -687 +682 @@
     Revision = revisions.model.Revision = Backbone.Model.extend({
         idAttribute: 'ID',
-        urlRoot: ajaxurl +  '?action=revisions-data' +
-            '&show_autosaves=true&show_split_view=true&nonce=' + revisions.model.settings.nonce,
+
         defaults: {
             ID: 0,
@@ -696 +690 @@
             diff: '<div class="diff-loading"><div class="spinner"></div></div>',
             restoreLink: '',
-            revision_toload: false,
-            lines_added: 0,
-            lines_deleted: 0,
-            scope_of_changes: 'none',
-            previous_revision_id: 0,
-            is_current_revision: false
+            completed: false,
+            linesAdded: 0,
+            linesDeleted: 0,
+            scopeOfChanges: 'none',
+            previousID: 0,
+            isCurrent: false
         },
 
         url: function() {
             if ( Diff.singleRevision ) {
-                return this.urlRoot +
+                return ajaxurl +
+                    '?action=revisions-data' +
+                    '&show_autosaves=true' +
+                    '&show_split_view=true' +
+                    '&nonce=' + revisions.model.settings.nonce +
                     '&single_revision_id=' + this.id +
-                    '&compare_to=' + this.get( 'previous_revision_id' ) +
+                    '&compare_to=' + this.get( 'previousID' ) +
                     '&post_id=' + revisions.model.settings.post_id;
             } else {
@@ -722 +720 @@
     Revisions = revisions.Revisions = Backbone.Collection.extend({
         model: Revision,
-        urlRoot: ajaxurl + '?action=revisions-data',
 
         initialize: function( models, options ) {
@@ -737 +734 @@
 
         url: function() {
-            return this.urlRoot +
+            return ajaxurl +
+                '?action=revisions-data' +
                 '&compare_to=' + this.options.compareTo +
                 '&post_id=' + this.options.post_id +
@@ -748 +746 @@
 
         reload: function( options ) {
-            this.options = _.defaults( options || {}, this.options );
-
-            // TODO
-            //this.fetch();
+            this.options = _.defaults( options.options || {}, this.options );
+
+            this.fetch({
+                success: options.success || null,
+                error: options.error || null
+            });
         }
 

trunk/wp-admin/revision.php

@@ -158 +158 @@
 
 <script id="tmpl-revision-ticks" type="text/html">
-    <div class="revision-tick loading-{{{ data.revision_toload }}} scope-of-changes-{{{ data.scope_of_changes }}}"></div>
+    <div class="revision-tick completed-{{{ data.completed }}} scope-of-changes-{{{ data.scopeOfChanges }}}"></div>
 </script>
 <?php