Skip to content
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

Mailchimp Block: Remove wrapper from rendered markup #19639

Merged
merged 2 commits into from
Apr 26, 2021
Merged

Mailchimp Block: Remove wrapper from rendered markup #19639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d166389
Mailchimp Block: Remove placeholder wrapper from server rendered mark…
andrewserong Apr 23, 2021
06123a4
Add changelog entry
andrewserong Apr 23, 2021
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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-mailchimp-placeholder-state-in-fse
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Mailchimp block: Remove placeholder wrapper div from server rendered markup to fix CSS issue when upgrade nudges are present on the front end.
160 changes: 79 additions & 81 deletions projects/plugins/jetpack/extensions/blocks/mailchimp/mailchimp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,94 +64,92 @@ function load_assets( $attr, $content ) {
?>

<div class="<?php echo esc_attr( $classes ); ?>" data-blog-id="<?php echo esc_attr( $blog_id ); ?>">
<div class="components-placeholder">
<form
aria-describedby="wp-block-jetpack-mailchimp_consent-text"
<?php if ( $is_amp_request ) : ?>
action-xhr="<?php echo esc_url( $amp_form_action ); ?>"
method="post"
id="mailchimp_form"
target="_top"
on="submit-success:AMP.setState( { mailing_list_status: 'subscribed', mailing_list_email: event.response.email } )"
<?php endif; ?>
>
<p>
<input
aria-label="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
placeholder="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
required
title="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
type="email"
name="email"
/>
</p>
<?php foreach ( is_array( $values['interests'] ) ? $values['interests'] : array() as $interest ) : ?>
<input
name="interests[<?php echo esc_attr( $interest ); ?>]"
type="hidden"
class="mc-submit-param"
value="1"
/>
<?php endforeach; ?>
<?php
if (
! empty( $values['signupFieldTag'] )
&& ! empty( $values['signupFieldValue'] )
) :
?>
<input
name="merge_fields[<?php echo esc_attr( $values['signupFieldTag'] ); ?>]"
type="hidden"
class="mc-submit-param"
value="<?php echo esc_attr( $values['signupFieldValue'] ); ?>"
/>
<?php endif; ?>
<?php echo render_button( $attr, $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
<p id="wp-block-jetpack-mailchimp_consent-text">
<?php echo wp_kses_post( $values['consentText'] ); ?>
</p>

<?php if ( $is_amp_request ) : ?>

<div submit-success>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_success wp-block-jetpack-mailchimp__is-amp">
<?php echo esc_html( $values['successLabel'] ); ?>
</div>
</template>
</div>
<div submit-error>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_error wp-block-jetpack-mailchimp__is-amp">
<?php echo esc_html( $values['errorLabel'] ); ?>
</div>
</template>
</div>
<div submitting>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_processing wp-block-jetpack-mailchimp__is-amp" role="status">
<?php echo esc_html( $values['processingLabel'] ); ?>
</div>
</template>
</div>

<?php endif; ?>
<form
aria-describedby="wp-block-jetpack-mailchimp_consent-text"
<?php if ( $is_amp_request ) : ?>
action-xhr="<?php echo esc_url( $amp_form_action ); ?>"
method="post"
id="mailchimp_form"
target="_top"
on="submit-success:AMP.setState( { mailing_list_status: 'subscribed', mailing_list_email: event.response.email } )"
<?php endif; ?>
>
<p>
<input
aria-label="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
placeholder="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
required
title="<?php echo esc_attr( $values['emailPlaceholder'] ); ?>"
type="email"
name="email"
/>
</p>
<?php foreach ( is_array( $values['interests'] ) ? $values['interests'] : array() as $interest ) : ?>
<input
name="interests[<?php echo esc_attr( $interest ); ?>]"
type="hidden"
class="mc-submit-param"
value="1"
/>
<?php endforeach; ?>
<?php
if (
! empty( $values['signupFieldTag'] )
&& ! empty( $values['signupFieldValue'] )
) :
?>
<input
name="merge_fields[<?php echo esc_attr( $values['signupFieldTag'] ); ?>]"
type="hidden"
class="mc-submit-param"
value="<?php echo esc_attr( $values['signupFieldValue'] ); ?>"
/>
<?php endif; ?>
<?php echo render_button( $attr, $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
<p id="wp-block-jetpack-mailchimp_consent-text">
<?php echo wp_kses_post( $values['consentText'] ); ?>
</p>

</form>
<?php if ( ! $is_amp_request ) : ?>
<?php if ( $is_amp_request ) : ?>

<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_processing" role="status">
<?php echo esc_html( $values['processingLabel'] ); ?>
<div submit-success>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_success wp-block-jetpack-mailchimp__is-amp">
<?php echo esc_html( $values['successLabel'] ); ?>
</div>
</template>
</div>
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_success" role="status">
<?php echo esc_html( $values['successLabel'] ); ?>
<div submit-error>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_error wp-block-jetpack-mailchimp__is-amp">
<?php echo esc_html( $values['errorLabel'] ); ?>
</div>
</template>
</div>
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_error" role="alert">
<?php echo esc_html( $values['errorLabel'] ); ?>
<div submitting>
<template type="amp-mustache">
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_processing wp-block-jetpack-mailchimp__is-amp" role="status">
<?php echo esc_html( $values['processingLabel'] ); ?>
</div>
</template>
</div>

<?php endif; ?>
</div>

</form>
<?php if ( ! $is_amp_request ) : ?>

<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_processing" role="status">
<?php echo esc_html( $values['processingLabel'] ); ?>
</div>
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_success" role="status">
<?php echo esc_html( $values['successLabel'] ); ?>
</div>
<div class="wp-block-jetpack-mailchimp_notification wp-block-jetpack-mailchimp_error" role="alert">
<?php echo esc_html( $values['errorLabel'] ); ?>
</div>

<?php endif; ?>
</div>
<?php
$html = ob_get_clean();
Expand Down