Merge pull request #22 from ClubPress/dev

v2.1.11
WPClubManager · May 18, 2020 · 1deabb3 · 1deabb3
2 parents 0b62ec2 + 6790288
commit 1deabb3
Show file tree

Hide file tree

Showing 7 changed files with 3,919 additions and 13 deletions.
diff --git a/assets/js/admin/meta-boxes.js b/assets/js/admin/meta-boxes.js
@@ -321,7 +321,7 @@ jQuery( function($){
 		});
 	}).trigger( 'wpcm-init-datepickers' );
 
-	$('.wpcm-time-picker').timepicker({
+	$('.wpcm-time-picker').jquery_timepicker({
 		timeFormat: 'H:i',
 		step: '15'
 	});

diff --git a/assets/js/admin/meta-boxes.min.js b/assets/js/admin/meta-boxes.min.js
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
@@ -42,7 +42,7 @@ jQuery(window).load(function(){
 		return false;
 	});
 
-	jQuery('.wpcm-default-time-picker').timepicker({
+	jQuery('.wpcm-default-time-picker').jquery_timepicker({
 		timeFormat: 'H:i',
 		step: '15',
 		scrollDefault: '15:00'

diff --git a/assets/js/admin/settings.min.js b/assets/js/admin/settings.min.js