Ticket #38752: 38752.diff

src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js

@@ -59 +59 @@
                                         'clip': 'auto',
                                         'position': 'relative'
                                 } );
-                                $( '.site-branding, .site-branding a, .site-description, .site-description a' ).css( {
-                                        'color': to
-                                } );
+                                $( '.site-branding, .site-branding a, .site-description, .site-description a' )
+                                        .css( {
+                                                'color': to
+                                        } );
                                 $( 'body' ).removeClass( 'title-tagline-hidden' );
                         }
                 } );
@@ -72 +73 @@
                 value.bind( function( to ) {
 
                         // Update color body class.
-                        $( 'body' ).removeClass( 'colors-light colors-dark colors-custom' )
-                                   .addClass( 'colors-' + to );
+                        $( 'body' )
+                                .removeClass( 'colors-light colors-dark colors-custom' )
+                                .addClass( 'colors-' + to );
                 } );
         } );
 
@@ -83 +85 @@
 
                         // Update custom color CSS
                         var style = $( '#custom-theme-colors' ),
-                            hue = style.data( 'hue' ),
-                            css = style.html();
+                                hue = style.data( 'hue' ),
+                                css = style.html();
 
                         css = css.split( hue + ',' ).join( to + ',' ); // Equivalent to css.replaceAll, with hue followed by comma to prevent values with units from being changed.
-                        style.html( css )
-                             .data( 'hue', to );
+                        style.html( css ).data( 'hue', to );
                 } );
         } );
 

src/wp-content/themes/twentyseventeen/assets/js/global.js

@@ -164 +164 @@
         $( document ).ready( function() {
 
                 // If navigation menu is present on page, setNavProps and adjustScrollClass
-                if( $navigation.length ) {
+                if ( $navigation.length ) {
                         setNavProps();
                         adjustScrollClass();
                 }

src/wp-content/themes/twentyseventeen/assets/js/navigation.js

@@ -14 +14 @@
                 var dropdownToggle = $( '<button />', {
                         'class': 'dropdown-toggle',
                         'aria-expanded': false
-                } ).append( twentyseventeenScreenReaderText.icon )
-                .append( $( '<span />', {
-                        'class': 'screen-reader-text',
-                        text: twentyseventeenScreenReaderText.expand
-                } ) );
+                } )
+                        .append( twentyseventeenScreenReaderText.icon )
+                        .append( $( '<span />', {
+                                'class': 'screen-reader-text',
+                                text: twentyseventeenScreenReaderText.expand
+                        } ) );
 
                 container.find( '.menu-item-has-children > a, .page_item_has_children > a' ).after( dropdownToggle );
 
@@ -30 +31 @@
                 container.find( '.menu-item-has-children, .page_item_has_children' ).attr( 'aria-haspopup', 'true' );
 
                 container.find( '.dropdown-toggle' ).click( function( e ) {
-                        var _this            = $( this ),
-                                screenReaderSpan = _this.find( '.screen-reader-text' );
+                        var _this        = $( this ),
+                        screenReaderSpan = _this.find( '.screen-reader-text' ),
+                        screenReaderSpanText;
 
                         e.preventDefault();
                         _this.toggleClass( 'toggled-on' );
                         _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' );
 
-                        // jscs:disable
                         _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' );
-                        // jscs:enable
-                        screenReaderSpan.text( screenReaderSpan.text() === twentyseventeenScreenReaderText.expand ? twentyseventeenScreenReaderText.collapse : twentyseventeenScreenReaderText.expand );
+
+                        if ( screenReaderSpan.text() === twentyseventeenScreenReaderText.expand ) {
+                                screenReaderSpanText = twentyseventeenScreenReaderText.collapse;
+                        } else {
+                                screenReaderSpanText = twentyseventeenScreenReaderText.expand
+                        }
+                        
+                        screenReaderSpan.text( screenReaderSpanText );
                 } );
         }
         initMainNavigation( $( '.main-navigation' ) );
@@ -63 +70 @@
                 menuToggle.on( 'click.twentyseventeen', function() {
                         $( siteNavigation.closest( '.main-navigation' ), this ).toggleClass( 'toggled-on' );
 
-                        // jscs:disable
-                        $( this ).add( siteNavigation ).attr( 'aria-expanded', $( this ).add( siteNavigation ).attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' );
-                        // jscs:enable
+                        $( this )
+                                .add( siteNavigation )
+                                .attr( 'aria-expanded', $( this ).add( siteNavigation ).attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' );
                 } );
         } )();