Merge branch 'develop' into trunk

Author: jeffpaul

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.0.4] - 2021-03-24
+### Fixed
+- `initializeSlotData()` now correctly receives an event instead of a `Slot` (props [@darylldoyle](https://github.com/darylldoyle) via [#39](https://github.com/10up/Ad-Refresh-Control/pull/39)).
+- `isEligible()` prevents Uncaught TypeError by checking if `event.size` exists before attempting to access it (props [@darylldoyle](https://github.com/darylldoyle) via [#39](https://github.com/10up/Ad-Refresh-Control/pull/39)).
+
+### Security
+- Bump `elliptic` from 6.5.3 to 6.5.4 (props [@dependabot](https://github.com/apps/dependabot) via [#37](https://github.com/10up/Ad-Refresh-Control/pull/37)).
+
 ## [1.0.3] - 2021-03-09
 ### Added
 - Custom callback and `avc_refresh_callback` filter to be used when an ad slot is ready for refresh (props [@darylldoyle](https://github.com/darylldoyle) via [#34](https://github.com/10up/Ad-Refresh-Control/pull/34)).
@@ -50,6 +58,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial public release! 🎉
 
 [Unreleased]: https://github.com/10up/Ad-Refresh-Control/compare/trunk...develop
+[1.0.4]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.3...1.0.4
 [1.0.3]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.2...1.0.3
 [1.0.2]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/10up/Ad-Refresh-Control/compare/v1.0.0...1.0.1

ad-refresh-control.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Ad Refresh Control
  * Plugin URI:        https://github.com/10up/Ad-Refresh-Control
  * Description:       Enable Active View refresh for Google Ad Manager ads without needing to modify any code.
- * Version:           1.0.3
+ * Version:           1.0.4
  * Requires at least: 4.9
  * Requires PHP:      7.0
  * Author:            10up
@@ -17,7 +17,7 @@
  */
 
 // Useful global constants.
-define( 'AD_REFRESH_CONTROL_VERSION', '1.0.3' );
+define( 'AD_REFRESH_CONTROL_VERSION', '1.0.4' );
 define( 'AD_REFRESH_CONTROL_URL', plugin_dir_url( __FILE__ ) );
 define( 'AD_REFRESH_CONTROL_PATH', plugin_dir_path( __FILE__ ) );
 define( 'AD_REFRESH_CONTROL_INC', AD_REFRESH_CONTROL_PATH . 'includes/' );

assets/js/frontend/components/gpt-active-view-refresh.js

@@ -58,7 +58,7 @@ const impressionViewableHandler = ( event ) => {
 		return;
 	}
 	if ( 'undefined' === typeof adsData[ slotID ] ) {
-		initializeSlotData( event.slot );
+		initializeSlotData( event );
 	}
 	adsData[ slotID ].viewable = true;
 };
@@ -144,7 +144,8 @@ const isEligible = ( event ) => {
 		return false;
 	}
 
-	let slotSize = event.size.toString();
+	// The size property only exists within the googletag.events.SlotRenderEndedEvent so we need to check it's there before accessing it.
+	let slotSize = 'size' in event ? event.size.toString() : false;
 
 	const slotSizes = slot.getSizes();
 	const slotID = slot.getSlotElementId();

dist/js/frontend.js

@@ -1,6 +1,6 @@
 {
   "name": "@10up/ad-refresh-control",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Ad Refresh Control",
   "license": "GPL-2.0-or-later",
   "homepage": "https://github.com/10up/ad-refresh-control",

package-lock.json

@@ -4,7 +4,7 @@ Tags:              google, ad manager
 Requires at least: 4.9
 Tested up to:      5.7
 Requires PHP:      7.0
-Stable tag:        1.0.3
+Stable tag:        1.0.4
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -43,6 +43,11 @@ __Excluded Advertiser IDs__: Prevent ad refreshes for specific advertiser IDs in
 
 == Changelog ==
 
+= 1.0.4 =
+* **Fixed:** `initializeSlotData()` now correctly receives an event instead of a `Slot` (props [@enshrined](https://profiles.wordpress.org/enshrined/)).
+* **Fixed:** `isEligible()` prevents Uncaught TypeError by checking if `event.size` exists before attempting to access it (props [@enshrined](https://profiles.wordpress.org/enshrined/)).
+* **Security:** Bump `elliptic` from 6.5.3 to 6.5.4 (props [@enshrined](https://profiles.wordpress.org/enshrined/)).
+
 = 1.0.3 =
 * **Added:** Custom callback and `avc_refresh_callback` filter to be used when an ad slot is ready for refresh (props [@enshrined](https://profiles.wordpress.org/enshrined/)).
 * **Added:** Linting and testing GitHub Actions (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul/), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)).