Changeset 24636

Timestamp:

07/10/2013 05:40:45 AM (13 years ago)

Author:

markjaquith

Message:

Revisions: remove some redundant code.

• Move some slider code into the slider view that was loitering in the checkmark view.
• this.$(), not $().
• Cache a selector.
• toggleClass(), not addClass() with a ternary.
• Remove two classes with a single removeClass().

See #24425.

File:

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

trunk/wp-admin/js/revisions.js

@@ -496 +496 @@
 
                 updateCompareTwoMode: function() {
-                        if ( this.model.get('compareTwoMode') ) {
-                                $('.compare-two-revisions').prop( 'checked', true );
-                                // in RTL mode the 'left handle' is the second in the slider, 'right' is first
-                                $('.wp-slider a.ui-slider-handle').first().addClass( isRtl ? 'right-handle' : 'left-handle' );
-                                $('.wp-slider a.ui-slider-handle').last().addClass( isRtl ? 'left-handle' : 'right-handle' );
-                        } else {
-                                $('.compare-two-revisions').prop( 'checked', false );
-                                $('.wp-slider a.ui-slider-handle').removeClass('left-handle').removeClass('right-handle');
-                        }
-
+                        this.$('.compare-two-revisions').prop( 'checked', this.model.get('compareTwoMode') );
                 },
 
@@ -721 +712 @@
 
                 updateSliderSettings: function() {
+                        var handles;
+
                         if ( this.model.get('compareTwoMode') ) {
                                 var leftValue, rightValue;
@@ -751 +744 @@
                                         range: true // Range mode ensures handles can't cross
                                 } );
+
+                                handles = this.$('a.ui-slider-handle');
+                                // in RTL mode the 'left handle' is the second in the slider, 'right' is first
+                                handles.first()
+                                        .toggleClass( 'right-handle', !! isRtl )
+                                        .toggleClass( 'left-handle', ! isRtl );
+                                handles.last()
+                                        .toggleClass( 'left-handle', !! isRtl )
+                                        .toggleClass( 'right-handle', ! isRtl );
+
                         } else {
                                 this.$el.slider( { // Set handle to current to model
                                         // Reverse order for RTL.
-                                        value: isRtl ?  this.model.revisions.length - this.model.revisions.indexOf( this.model.get('to') ) - 1 :
+                                        value: isRtl ? this.model.revisions.length - this.model.revisions.indexOf( this.model.get('to') ) - 1 :
                                                                         this.model.revisions.indexOf( this.model.get('to') ),
                                         values: null, // Clear existing two handled values
                                         range: false
                                 } );
-                        }
-
-                        if ( this.model.get('compareTwoMode') ){
-                                // in RTL mode the 'left handle' is the second in the slider, 'right' is first
-                                $( 'a.ui-slider-handle', this.$el )
-                                        .first()
-                                        .addClass( isRtl ? 'right-handle' : 'left-handle' )
-                                        .removeClass( isRtl ? 'left-handle' : 'right-handle' );
-                                $( 'a.ui-slider-handle', this.$el )
-                                        .last()
-                                        .addClass( isRtl ? 'left-handle' : 'right-handle' )
-                                        .removeClass( isRtl ? 'right-handle' : 'left-handle' );
+                                this.$('a.ui-slider-handle').removeClass('left-handle right-handle');
                         }
                 },