Merge pull request #774 from pressbooks/pbb-751-jQueryUpgrade

Fix jQuery deprecation warnings

Author: arzola

.github/workflows/.pipeline.yml

@@ -13,9 +13,9 @@ jobs:
       matrix:
         php: [ 7.3 ]
         os: [ ubuntu-18.04 ]
-        wordpress: [ 5.6.2 ]
+        wordpress: [ 5.6.2, 5.7.2 ]
 
-    name: Test - PHP ${{ matrix.php }}
+    name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
 
     env:
       WP_VERSION: ${{ matrix.wordpress }}

assets/src/scripts/routes/common.js

@@ -77,7 +77,7 @@ export default {
 				let $svgArrow = jQuery( 'button[aria-expanded] > svg' );
 				let $toggleButton = jQuery( 'button[aria-expanded]' );
 
-				jQuery( $toggleButton, $svgArrow ).click( function ( e ) {
+				jQuery( $toggleButton, $svgArrow ).on( 'click', function ( e ) {
 					// Cast the state as a boolean
 					let expanded = btn.getAttribute( 'aria-expanded' ) === 'true' || false;
 
@@ -173,7 +173,7 @@ export default {
 			$( '#h5p-show-hide' ).text( $( '#h5p-show-hide' ).attr( 'show-all-text' ) );
 			$( '.h5p-row-item' ).text( $( '.h5p-row-item' ).attr( 'show-activity-text' ) );
 
-			$h5pActivities.click( function () {
+			$h5pActivities.on( 'click', function () {
 				if ( $( this ).text() === $( this ).attr( 'show-activity-text' ) ) {
 					$activityContainer.hide();
 					$( this ).closest( 'tr' ).next( this ).show( 'slow' );
@@ -185,7 +185,7 @@ export default {
 				}
 			} );
 
-			$( '#h5p-show-hide' ).click( function () {
+			$( '#h5p-show-hide' ).on( 'click', function () {
 				if ( $( this ).text() === $( this ).attr( 'show-all-text' ) ) {
 					$activityContainer.show();
 					$( this ).text( $( this ).attr( 'hide-all-text' ) );

assets/src/scripts/routes/home.js

@@ -18,7 +18,7 @@ export default {
 						.find(
 							'ol'
 						)
-						.removeAttr( 'hidden' );
+						.prop( 'hidden', false );
 				} );
 				$target.parents( '.toc__toggle' ).attr( 'aria-expanded', 'true' );
 			} );

assets/src/scripts/routes/single.js

@@ -3,7 +3,7 @@ export default {
 		// Javascript to be fired on single reading view
 		jQuery( $ => {
 			let toggle = $( '.block-reading-meta__compare__toggle' );
-			toggle.click( event => {
+			toggle.on( 'click', event => {
 				let activity = $( '.block-reading-meta__compare__activity' );
 				let alert = $( '.alert' );
 				let container = $( '.block-reading-meta__compare__comparison' );
@@ -12,9 +12,9 @@ export default {
 				alert.addClass( 'visually-hidden' );
 				if ( $( event.currentTarget ).attr( 'aria-expanded' ) === 'false' ) {
 					toggle.attr( 'aria-expanded', true );
-					activity.removeAttr( 'hidden' );
+					activity.prop( 'hidden', false );
 					if ( container.hasClass( 'populated' ) ) {
-						container.removeAttr( 'hidden' );
+						container.prop( 'hidden', false );
 						activity.attr( 'hidden', true );
 					} else {
 						alert.text( pressbooksBook.comparison_loading );
@@ -54,7 +54,7 @@ export default {
 												.text( deletions );
 											activity.attr( 'hidden', true );
 											alert.text( pressbooksBook.comparison_loaded );
-											container.removeAttr( 'hidden' );
+											container.prop( 'hidden', false );
 										}
 									  });
 								} );
@@ -78,7 +78,7 @@ export default {
 				const offset = 250;
 				const duration = 0;
 
-				$( window ).scroll( function () {
+				$( window ).on( 'scroll', function () {
 					if ( $( window ).scrollTop() > offset ) {
 						$( '.nav-reading__up' ).animate( { opacity: 1 }, duration );
 					}
@@ -87,7 +87,7 @@ export default {
 					}
 				} );
 
-				$( '.nav-reading__up' ).click( function ( event ) {
+				$( '.nav-reading__up' ).on( 'click', function ( event ) {
 					event.preventDefault();
 					$( '.nav-reading__up' )
 						.blur()
@@ -96,7 +96,7 @@ export default {
 					return false;
 				} );
 
-				$( document ).keydown( function ( e ) {
+				$( document ).on( 'keydown', function ( e ) {
 					if ( $( 'body' ).hasClass( 'no-navigation' ) ) {
 						return;
 					}
@@ -124,15 +124,15 @@ export default {
 							.removeAttr( 'width' );
 					} );
 
-					$( window ).resize( function () {
+					$( window ).on( 'resize', function () {
 						$allVideos.each( function () {
 							let $el = $( this );
 							let newWidth = $el.parent().parent().width();
 							$el
 								.width( newWidth )
 								.height( newWidth * $el.data( 'aspectRatio' ) );
 						} );
-					} ).resize();
+					} ).trigger( 'resize' );
 				} )();
 			} );
 		} );

dist/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/scripts/book.js": "/scripts/book.js?id=209ba93d22103a35854d",
+    "/scripts/book.js": "/scripts/book.js?id=af07185482a38384a7bf",
     "/styles/book.css": "/styles/book.css?id=3cbb775c3b4e63c64468",
     "/styles/web-house-style.css": "/styles/web-house-style.css?id=d3c1aedc7525b0f30ccd",
     "/scripts/collapse-sections.js": "/scripts/collapse-sections.js?id=ba8eb815cea5fd273013",