- __ATA.cmd.push(function() {
- __ATA.initSlot('atatags-{$ad_number}', {
- collapseEmpty: 'before',
- sectionId: '{$section_id}',
- location: {$loc_id},
- width: {$width},
- height: {$height}
- });
- });
+ window.getAdSnippetCallback = function () {
+ if ( true === ( window.isWatlV1 ?? false ) ) {
+ // Use IPONWEB scripts.
+ window.__ATA = window.__ATA || {};
+ window.__ATA.cmd = __ATA.cmd || [];
+ window.__ATA.cmd.push(function() {
+ window.__ATA.initSlot('atatags-{$ad_number}', {
+ collapseEmpty: 'before',
+ sectionId: '{$section_id}',
+ location: {$loc_id},
+ width: {$width},
+ height: {$height}
+ });
+ });
+ } else {
+ // Use Aditude scripts.
+ window.tudeMappings = window.tudeMappings || [];
+ window.tudeMappings.push( {
+ divId: 'atatags-{$ad_number}',
+ format: '{$format}',
+ width: {$width},
+ height: {$height},
+ } );
+ }
+ }
+
+ if ( document.readyState === 'loading' ) {
+ document.addEventListener( 'DOMContentLoaded', window.getAdSnippetCallback );
+ } else {
+ window.getAdSnippetCallback();
+ }
@@ -781,12 +821,9 @@ public function get_ad_snippet( $section_id, $height, $width, $location = '', $c
* @since 8.7
*/
public function get_dynamic_ad_snippet( $section_id, $form_factor = 'square', $location = '', $relocate = '', $id = null ) {
+ $is_location_enabled = in_array( $location, array( 'top', 'belowpost', 'inline' ), true );
- // Allow overriding and printing of the tag parsed by the WATL.
- // phpcs:disable WordPress.Security.NonceVerification.Recommended
- $is_location_enabled = isset( $_GET['wordads-logging'] ) && isset( $_GET[ $location ] ) && 'true' === $_GET[ $location ];
-
- if ( ( 'top' === $location || 'belowpost' === $location ) && $is_location_enabled ) {
+ if ( $is_location_enabled ) {
return self::get_watl_ad_html_tag( $location );
}
@@ -965,7 +1002,32 @@ public function get_house_ad( $unit = 'mrec' ) {
* @since 8.7
*/
public static function get_watl_ad_html_tag( string $slot_type ): string {
- return "";
+ $uid = uniqid( 'atatags-dynamic-' . $slot_type . '-' );
+
+ return <<
+
+
+
+
+HTML;
}
/**
diff --git a/projects/plugins/jetpack/modules/wordads/js/adflow-loader.js b/projects/plugins/jetpack/modules/wordads/js/adflow-loader.js
index 67d51d14f3a3e..8e05e84754c34 100644
--- a/projects/plugins/jetpack/modules/wordads/js/adflow-loader.js
+++ b/projects/plugins/jetpack/modules/wordads/js/adflow-loader.js
@@ -11,11 +11,26 @@ function a8c_adflow_callback( data ) {
}
// Load each adflow script.
+ window.isWatlV1 = window.isWatlV1 ?? false;
data.scripts.forEach( function ( scriptUrl ) {
let script = document.createElement( 'script' );
script.src = scriptUrl;
document.head.appendChild( script );
+ if ( scriptUrl.indexOf( 'watl.js' ) !== -1 ) {
+ window.isWatlV1 = true;
+ }
} );
+
+ window.loadIPONWEB = window.loadIPONWEB ?? function () {}; // Satisfy linter
+
+ if ( window.isWatlV1 ) {
+ // Then load IPONWEB scripts.
+ if ( document.readyState === 'loading' ) {
+ document.addEventListener( 'DOMContentLoaded', window.loadIPONWEB );
+ } else {
+ window.loadIPONWEB();
+ }
+ }
}
}
window.a8c_adflow_callback = a8c_adflow_callback;
diff --git a/projects/plugins/jetpack/modules/wordads/php/class-wordads-formats.php b/projects/plugins/jetpack/modules/wordads/php/class-wordads-formats.php
new file mode 100644
index 0000000000000..42e0719e06077
--- /dev/null
+++ b/projects/plugins/jetpack/modules/wordads/php/class-wordads-formats.php
@@ -0,0 +1,46 @@
+get_config_url() ),
+ $this->get_config_url(), // The URL is not escaped because we need two parameters to pass.
array( 'adflow_script_loader' ),
JETPACK__VERSION,
false
@@ -248,8 +248,9 @@ public function resource_hints( $hints, $relation_type ) {
*/
private function get_config_url(): string {
return sprintf(
- 'https://public-api.wordpress.com/wpcom/v2/sites/%1$d/adflow/conf/?_jsonp=a8c_adflow_callback',
- $this->params->blog_id
+ 'https://public-api.wordpress.com/wpcom/v2/sites/%1$d/adflow/conf/?_jsonp=a8c_adflow_callback&is_singular_post=%2$d&',
+ $this->params->blog_id,
+ (int) is_singular( 'post' )
);
}
diff --git a/projects/plugins/jetpack/phpunit.11.xml.dist b/projects/plugins/jetpack/phpunit.11.xml.dist
index b53439e40f979..14884b5a5787b 100644
--- a/projects/plugins/jetpack/phpunit.11.xml.dist
+++ b/projects/plugins/jetpack/phpunit.11.xml.dist
@@ -69,6 +69,9 @@
tests/php/modules/widget-visibility
+
+ tests/php/modules/wordads
+
tests/php/modules/sitemaps
diff --git a/projects/plugins/jetpack/phpunit.9.xml.dist b/projects/plugins/jetpack/phpunit.9.xml.dist
index fcb7905fa8bb7..0921a17477597 100644
--- a/projects/plugins/jetpack/phpunit.9.xml.dist
+++ b/projects/plugins/jetpack/phpunit.9.xml.dist
@@ -60,6 +60,9 @@
tests/php/modules/widget-visibility
+
+ tests/php/modules/wordads
+
tests/php/modules/sitemaps
diff --git a/projects/plugins/jetpack/tests/php/modules/wordads/WordAds_Formats_Test.php b/projects/plugins/jetpack/tests/php/modules/wordads/WordAds_Formats_Test.php
new file mode 100644
index 0000000000000..b66b78185bbab
--- /dev/null
+++ b/projects/plugins/jetpack/tests/php/modules/wordads/WordAds_Formats_Test.php
@@ -0,0 +1,67 @@
+ array(
+ 300,
+ 250,
+ 'gutenberg_rectangle',
+ ),
+ 'gutenberg_leaderboard' => array(
+ 728,
+ 90,
+ 'gutenberg_leaderboard',
+ ),
+ 'gutenberg_mobile_leaderboard' => array(
+ 320,
+ 50,
+ 'gutenberg_mobile_leaderboard',
+ ),
+ 'gutenberg_skyscraper' => array(
+ 160,
+ 600,
+ 'gutenberg_skyscraper',
+ ),
+ 'unknown_format' => array(
+ 400,
+ 300,
+ '',
+ ),
+ );
+ }
+
+ /**
+ * Test the widget method that outputs the markup.
+ *
+ * @dataProvider get_format_data
+ * @param int $width The block's width.
+ * @param int $height The block's height.
+ * @param string $expected The expected format slug.
+ */
+ #[DataProvider( 'get_format_data' )]
+ public function test_get_format_slug( int $width, int $height, string $expected ): void {
+ $this->assertEquals(
+ $expected,
+ WordAds_Formats::get_format_slug( $width, $height )
+ );
+ }
+}