Remove "Use Javascript Datepicker?" setting

mailchimp.php

@@ -156,7 +156,7 @@ function mailchimp_sf_load_resources() {
 		);
 	}
 
-	if ( get_option( 'mc_use_datepicker' ) === 'on' && ! is_admin() ) {
+	if ( ! is_admin() ) {
 		// Datepicker theme
 		wp_enqueue_style( 'flick', MCSF_URL . 'assets/css/flick/flick.css', array(), MCSF_VER );
 
@@ -178,7 +178,7 @@ function mc_datepicker_load() {
 	require_once MCSF_DIR . '/views/datepicker.php';
 }
 
-if ( get_option( 'mc_use_datepicker' ) === 'on' && ! is_admin() ) {
+if ( ! is_admin() ) {
 	add_action( 'wp_head', 'mc_datepicker_load' );
 }
 
@@ -377,7 +377,6 @@ function mailchimp_sf_needs_upgrade() {
 function mailchimp_sf_delete_setup() {
 	$options = array(
 		'mc_user_id',
-		'mc_use_datepicker',
 		'mc_use_unsub_link',
 		'mc_list_id',
 		'mc_list_name',
@@ -438,7 +437,6 @@ function mailchimp_sf_set_form_defaults( $list_name = '' ) {
 	update_option( 'mc_header_content', esc_html__( 'Sign up for', 'mailchimp' ) . ' ' . $list_name );
 	update_option( 'mc_submit_text', esc_html__( 'Subscribe', 'mailchimp' ) );
 
-	update_option( 'mc_use_datepicker', 'on' );
 	update_option( 'mc_custom_style', 'off' );
 	update_option( 'mc_double_optin', true );
 	update_option( 'mc_use_unsub_link', 'off' );
@@ -460,16 +458,6 @@ function mailchimp_sf_set_form_defaults( $list_name = '' ) {
  **/
 function mailchimp_sf_save_general_form_settings() {
 
-	if ( isset( $_POST['mc_use_datepicker'] ) ) {
-		update_option( 'mc_use_datepicker', 'on' );
-		$msg = '<p class="success_msg">' . esc_html__( 'Datepicker turned On!', 'mailchimp' ) . '</p>';
-		mailchimp_sf_global_msg( $msg );
-	} elseif ( get_option( 'mc_use_datepicker' ) !== 'off' ) {
-		update_option( 'mc_use_datepicker', 'off' );
-		$msg = '<p class="success_msg">' . esc_html__( 'Datepicker turned Off!', 'mailchimp' ) . '</p>';
-		mailchimp_sf_global_msg( $msg );
-	}
-
 	/*Enable double optin toggle*/
 	if ( isset( $_POST['mc_double_optin'] ) ) {
 		update_option( 'mc_double_optin', true );

tests/cypress/e2e/settings.test.js

@@ -162,7 +162,6 @@ describe('Admin can update plugin settings', () => {
 	it('Admin can set list options settings', () => {
 		// Remove mailchimp CSS.
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
-		cy.get('#mc_use_datepicker').uncheck();
 		cy.get('#mc_use_unsub_link').check();
 		cy.get('input[value="Update Subscribe Form Settings"]').first().click();
 
@@ -177,7 +176,6 @@ describe('Admin can update plugin settings', () => {
 
 		// Reset
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
-		cy.get('#mc_use_datepicker').check();
 		cy.get('#mc_use_unsub_link').uncheck();
 		cy.get('input[value="Update Subscribe Form Settings"]').first().click();
 

views/setup_page.php

@@ -229,13 +229,6 @@ function ( $ele ) {
 				<table class="widefat mc-widefat">
 					<tr><th colspan="2"><?php esc_html_e( 'List Options', 'mailchimp' ); ?></th></tr>
 
-					<tr valign="top">
-						<th scope="row"><?php esc_html_e( 'Use JavaScript Datepicker?', 'mailchimp' ); ?></th>
-						<td><input name="mc_use_datepicker" type="checkbox" <?php checked( get_option( 'mc_use_datepicker' ), 'on' ); ?> id="mc_use_datepicker" class="code" />
-							<em><label for="mc_use_datepicker"><?php esc_html_e( 'We\'ll use the jQuery UI Datepicker for dates.', 'mailchimp' ); ?></label></em>
-						</td>
-					</tr>
-
 					<tr valign="top">
 						<th scope="row"><?php esc_html_e( 'Use Double Opt-In (Recommended)?', 'mailchimp' ); ?></th>
 						<td><input name="mc_double_optin" type="checkbox" <?php checked( get_option( 'mc_double_optin' ), true ); ?> id="mc_double_optin" class="code" />