Skip to content

Hook up packages/jetpack-forms to plugins/jetpack #28416

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
jeherve merged 3 commits into from
Jan 18, 2023
Merged

Hook up packages/jetpack-forms to plugins/jetpack #28416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e3709
Hook up packages/jetpack-forms to plugins/jetpack
ice9js Jan 17, 2023
06c7674
changelog
ice9js Jan 17, 2023
c835db0
Update condition to use a filter instead of a constant
ice9js Jan 18, 2023
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/packages/forms/changelog/add-forms-dependency
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: added

Added a public load_contact_form method for initializing the contact form module.
5 changes: 5 additions & 0 deletions projects/packages/forms/src/class-jetpack-forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ class Jetpack_Forms {

const PACKAGE_VERSION = '0.1.0-alpha';

/**
* Load the contact form module.
*/
public static function load_contact_form() {
}
}
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/add-forms-dependency
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: other

Added the dependency on automattic/jetpack-forms
1 change: 1 addition & 0 deletions projects/plugins/jetpack/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"automattic/jetpack-constants": "@dev",
"automattic/jetpack-device-detection": "@dev",
"automattic/jetpack-error": "@dev",
"automattic/jetpack-forms": "@dev",
"automattic/jetpack-google-fonts-provider": "@dev",
"automattic/jetpack-identity-crisis": "@dev",
"automattic/jetpack-jitm": "@dev",
Expand Down
64 changes: 63 additions & 1 deletion projects/plugins/jetpack/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions projects/plugins/jetpack/modules/contact-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* @package automattic/jetpack
*/

use Automattic\Jetpack\Forms\Jetpack_Forms;

/**
* Module Name: Contact Form
* Module Description: Add a customizable contact form to any post or page using the Jetpack Form Block.
Expand All @@ -18,6 +20,21 @@
* Additional Search Queries: contact, form, grunion, feedback, submission, contact form, email, feedback, contact form plugin, custom form, custom form plugin, form builder, forms, form maker, survey, contact by jetpack, contact us, forms free
*/

/**
* Whether to load the newer Jetpack Forms package.
*
* @use add_filter( 'jetpack_contact_form_use_package', '__return_true' );
* @module contact-form
*
* @since $$next-version$$
*
* @param bool $load_contact_form_package Load Jetpack Forms package. Default to false.
*/
if ( apply_filters( 'jetpack_contact_form_use_package', false ) ) {
Jetpack_Forms::load_contact_form();
return true; // Not returning true will cause the module to become deactivated.
}

require_once __DIR__ . '/contact-form/grunion-contact-form.php';

/*
Expand Down