Skip to content

Ads module: Use vanilla JS instead of jQuery #14770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kraftbj merged 3 commits into from
Feb 25, 2020
Merged

Ads module: Use vanilla JS instead of jQuery #14770

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c05176e
Insert the top ad using vanilla JS instead of jQuery
dero Feb 22, 2020
96f8913
Fix the top ad insertion for twentyfourteen
dero Feb 25, 2020
2be199d
Minor CS tweaks while we're in the file
kraftbj Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions modules/wordads/wordads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class WordAds {

/**
* Checks for AMP support and returns true iff active & AMP request
*
* @return boolean True if supported AMP request
*
* @since 7.5.0
Expand Down Expand Up @@ -108,6 +109,7 @@ function option( $option, $default = false ) {

/**
* Returns the ad tag property array for supported ad types.
*
* @return array array with ad tags
*
* @since 7.1.0
Expand All @@ -118,6 +120,7 @@ function get_ad_tags() {

/**
* Returns the solo css for unit
*
* @return string the special css for solo units
*
* @since 7.1.0
Expand Down Expand Up @@ -423,7 +426,7 @@ function insert_header_ad() {
}

/**
* Special cases for inserting header unit via jQuery
* Special cases for inserting header unit via JS
*
* @since 4.5.0
*/
Expand All @@ -450,7 +453,7 @@ function insert_header_ad_special() {
$selector = '#main';
break;
case 'twentyfourteen':
$selector = 'article:first';
$selector = 'article';
break;
}

Expand All @@ -459,7 +462,15 @@ function insert_header_ad_special() {
if ( ! self::is_amp() ) {
echo <<<HTML
<script type="text/javascript">
jQuery('.wpcnt-header').insertBefore('$selector');
(function ( selector ) {
var main = document.querySelector( selector );
var headerAd = document.querySelector('.wpcnt-header');

if ( main ) {
main.parentNode.insertBefore( headerAd, main );
}
})( '$selector' );

</script>
HTML;
}
Expand Down Expand Up @@ -588,7 +599,7 @@ public function get_ad_snippet( $section_id, $height, $width, $location = '', $c

$ad_number = count( $this->ads ) . '-' . uniqid();
$data_tags = $this->params->cloudflare ? ' data-cfasync="false"' : '';
$css = esc_attr( $css );
$css = esc_attr( $css );

$loc_id = 100;
if ( ! empty( self::$ad_location_ids[ $location ] ) ) {
Expand Down Expand Up @@ -617,10 +628,10 @@ public function get_ad_snippet( $section_id, $height, $width, $location = '', $c
/**
* Returns the complete ad div with snippet to be inserted into the page
*
* @param string $spot top, side, inline, or belowpost
* @param string $snippet The snippet to insert into the div
* @param array $css_classes
* @return string The supporting ad unit div
* @param string $spot top, side, inline, or belowpost.
* @param string $snippet The snippet to insert into the div.
* @param array $css_classes CSS classes.
* @return string The supporting ad unit div.
*
* @since 7.1
*/
Expand All @@ -634,9 +645,9 @@ function get_ad_div( $spot, $snippet, array $css_classes = array() ) {
$css_classes[] = 'wpcnt-header';
}

$spot = esc_attr( $spot );
$spot = esc_attr( $spot );
$classes = esc_attr( implode( ' ', $css_classes ) );
$about = esc_html__( 'Advertisements', 'jetpack' );
$about = esc_html__( 'Advertisements', 'jetpack' );
return <<<HTML
<div class="$classes">
<div class="wpa">
Expand Down