Skip to content

Commit

Permalink
PR review modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
Khadreal committed Dec 18, 2024
1 parent 5e3c0ca commit 412781f
Showing 1 changed file with 23 additions and 18 deletions.
41 changes: 23 additions & 18 deletions classes/ThirdParty/Plugins/GravityForms.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ class GravityForms implements SubscriberInterface {
* @return array
*/
public static function get_subscribed_events(): array {
if ( class_exists( 'GFCommon' ) ) {
return [
'gform_noconflict_styles' => 'imagify_gf_noconflict_styles',
'gform_noconflict_scripts' => 'imagify_gf_noconflict_scripts',
];
if ( ! class_exists( 'GFCommon' ) ) {
return [];
}

return [];
return [
'gform_noconflict_styles' => 'imagify_gf_noconflict_styles',
'gform_noconflict_scripts' => 'imagify_gf_noconflict_scripts',
];
}

/**
Expand All @@ -34,13 +34,15 @@ public static function get_subscribed_events(): array {
* @return array
*/
public function imagify_gf_noconflict_styles( $styles ): array {
if ( $this->is_gravity_forms_no_conflict_mode_enabled() ) {
$styles[] = 'imagify-admin-bar';
$styles[] = 'imagify-admin';
$styles[] = 'imagify-notices';
$styles[] = 'imagify-pricing-modal';
if ( ! $this->is_gravity_forms_no_conflict_mode_enabled() ) {
return $styles;
}

$styles[] = 'imagify-admin-bar';
$styles[] = 'imagify-admin';
$styles[] = 'imagify-notices';
$styles[] = 'imagify-pricing-modal';

return $styles;
}

Expand All @@ -52,14 +54,17 @@ public function imagify_gf_noconflict_styles( $styles ): array {
* @return array
*/
public function imagify_gf_noconflict_scripts( $scripts ): array {
if ( $this->is_gravity_forms_no_conflict_mode_enabled() ) {
$scripts[] = 'imagify-admin-bar';
$scripts[] = 'imagify-sweetalert';
$scripts[] = 'imagify-admin';
$scripts[] = 'imagify-notices';
$scripts[] = 'imagify-pricing-modal';
if ( ! $this->is_gravity_forms_no_conflict_mode_enabled() ) {
return $scripts;
}


$scripts[] = 'imagify-admin-bar';
$scripts[] = 'imagify-sweetalert';
$scripts[] = 'imagify-admin';
$scripts[] = 'imagify-notices';
$scripts[] = 'imagify-pricing-modal';

return $scripts;
}

Expand All @@ -71,6 +76,6 @@ public function imagify_gf_noconflict_scripts( $scripts ): array {
private function is_gravity_forms_no_conflict_mode_enabled(): bool {
return is_plugin_active( 'gravityforms/gravityforms.php' )
&& get_option( 'gform_enable_noconflict', false )
&& GFForms::is_gravity_page(); // @phpstan-ignore-line
&& GFForms::is_gravity_page();
}
}

0 comments on commit 412781f

Please sign in to comment.