Better Gravity Forms compatibility with bootstrap-datepicker

nicomollet · Jun 14, 2021 · d137405 · d137405
1 parent c36967d
commit d137405
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Better Gravity Forms compatibility with bootstrap-datepicker
+
 ### 0.7.7: May 25th, 2021
 * Bootstrap select rules for Gravity Forms are conflicting on mobile
 

diff --git a/inc/front/scripts.php b/inc/front/scripts.php
@@ -128,6 +128,13 @@ function stormbringer_js_libraries_footer() {
 
 		if ( @$libraries['bootstrap-datepicker'] && get_theme_mod( 'libraries_bootstrap-datepicker', true ) ) {
 
+			wp_dequeue_script( 'gform_datepicker_init' );
+			wp_dequeue_script( 'gform-datepicker-init' );
+			wp_dequeue_script( 'jquery-ui-datepicker' );
+			wp_deregister_script( 'gform_datepicker_init' );
+			wp_deregister_script( 'gform-datepicker-init' );
+			wp_deregister_script( 'jquery-ui-datepicker' );
+
 			$lang_datepicker = ($lang == 'zh' ? 'zh-CN' : $lang);
 
 			wp_enqueue_script( 'bootstrap-datepicker',

diff --git a/inc/plugins/gravityforms.php b/inc/plugins/gravityforms.php
@@ -347,11 +347,13 @@ function stormbringer_gform_get_form_filter($content)
     //$content = preg_replace('/<ul class=\'gfield_checkbox\'(.*?)>(.*?)<\/ul>/', '\\2', $content);
     //$content = preg_replace('/<ul class=\'gfield_radio\'(.*?)>(.*?)<\/ul>/', '\\2', $content);
 
-    $content = str_replace('<li ', '<div ', $content);
-    $content = str_replace('<ul ', '<div ', $content);
-    $content = str_replace('</li>', '</div>', $content);
-    $content = str_replace('</ul>', '</div>', $content);
-
+	$content = str_replace( '<li ', '<div ', $content );
+	$content = str_replace( '<ul ', '<div ', $content );
+	$content = str_replace( '</li>', '</div>', $content );
+	$content = str_replace( '</ul>', '</div>', $content );
+	$content = str_replace( 'hasDatepicker', '', $content );
+	$content = str_replace( 'datepicker_no_icon', '', $content );
+	$content = str_replace( 'datepicker', '', $content );
 
     return $content;
 }