Easy Forms for MailChimp - Version 6.8.4

Version Description

  • April 12, 2021 =
  • Increase specifity of admin asset inclusion to prevent conflicts with other plugins.
Download this release

Release Info

Developer yikesinc
Plugin Icon 128x128 Easy Forms for MailChimp
Version 6.8.4
Comparing to
See all releases

Code changes from version 6.8.3 to 6.8.4

Files changed (15) hide show
  1. admin/class-yikes-inc-easy-mailchimp-extender-admin.php +18 -0
  2. admin/js/min/yikes-inc-easy-mailchimp-extender-admin.min.js +1 -1
  3. admin/js/yikes-inc-easy-mailchimp-extender-admin.js +1 -1
  4. admin/partials/edit-form.php +1 -1
  5. admin/partials/menu/add-ons.php +1 -1
  6. admin/partials/menu/manage-forms.php +1 -1
  7. admin/partials/menu/manage-lists.php +1 -1
  8. admin/partials/menu/options.php +1 -1
  9. admin/partials/menu/support.php +1 -1
  10. admin/partials/view-list.php +1 -1
  11. admin/partials/view-user.php +1 -1
  12. includes/class-yikes-inc-easy-mailchimp-extender.php +1 -2
  13. public/js/yikes-datepicker-scripts.min.js +1 -1
  14. readme.txt +4 -1
  15. yikes-inc-easy-mailchimp-extender.php +2 -2
admin/class-yikes-inc-easy-mailchimp-extender-admin.php CHANGED
@@ -682,6 +682,24 @@ class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
682
  <?php
683
  }
684
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
685
  /**
686
  * Register the stylesheets for the admin area.
687
  *
682
  <?php
683
  }
684
 
685
+ /**
686
+ * Conditionally run the asset registration functions
687
+ *
688
+ * @since 6.8.2
689
+ */
690
+ public function maybe_enqueue_assets( $hook_suffix ) {
691
+ // Enqueue styles on dashboard
692
+ if ( 'index.php' === $hook_suffix ) {
693
+ $this->enqueue_styles();
694
+ }
695
+
696
+ // Enqueue styles and scripts on plugin admin pages
697
+ if ( strpos( $hook_suffix, 'yikes' ) !== false && strpos( $hook_suffix, 'mailchimp' ) !== false ) {
698
+ $this->enqueue_scripts();
699
+ $this->enqueue_styles();
700
+ }
701
+ }
702
+
703
  /**
704
  * Register the stylesheets for the admin area.
705
  *
admin/js/min/yikes-inc-easy-mailchimp-extender-admin.min.js CHANGED
@@ -1 +1 @@
1
- function YIKES_Easy_MC_SwitchForm(e){window.location.replace(object_data.admin_url+"admin.php?page=yikes-mailchimp-edit-form&id="+e)}function toggleOptinValue(e){"true"==e.value?jQuery(".yks-mailchimp-single-optin-message").slideUp("fast",function(){jQuery(".yks-mailchimp-double-optin-message").slideDown("fast")}):jQuery(".yks-mailchimp-double-optin-message").slideUp("fast",function(){jQuery(".yks-mailchimp-single-optin-message").slideDown("fast")})}function toggleDeleteSubscriberButton(e){e.prop("checked")?jQuery("#delete-mailchimp-subscriber").removeAttr("disabled"):jQuery("#delete-mailchimp-subscriber").attr("disabled","disabled")}function checkForInterestGroups(e,s,t){var i=e.parents("li").find(".interest-groups-container").children().length;if(0==i)e.parents("li").find(".interest-groups-container").append("<p>"+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span><img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /></p>');else{var a=1;e.parents("li").find(".interest-groups-container").children().each(function(){jQuery(this).fadeOut("fast",function(){jQuery(this).remove(),a==i&&e.parents("li").find(".interest-groups-container").append("<p>"+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span><img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /></p>'),console.log(a),a++})})}var r={action:"check_list_for_interest_groups",list_id:s,integration:t};jQuery.ajax({url:object_data.ajax_url,type:"POST",data:r,dataType:"html",success:function(s,t,i){setTimeout(function(){e.parents("li").find(".interest-groups-container").html(s)},500)},error:function(e,s,t){alert(s+e.status+e.responseText+"...")},complete:function(e,s){}}),console.log(s)}function remove_interest_groups_for_list_checkbox_integrations(e){jQuery(e).parents("label").next(".integration-checkbox-interest-groups").slideUp(function(){jQuery(this).remove()})}function display_interest_groups_for_list_checkbox_integrations(e){display_interest_groups_loading_spinner(e),fetch_interest_groups_by_list_id(jQuery(e).val(),jQuery(e).data("integration"),e)}function fetch_interest_groups_by_list_id(e,s,t){var i={action:"check_list_for_interest_groups",list_id:e,integration:s};jQuery.ajax({url:object_data.ajax_url,type:"POST",data:i,dataType:"html",success:function(e,s,i){jQuery(t).parents("label").children(".interest-groups-loading").remove(),jQuery(t).parents("label").after(e)},error:function(e,s,t){alert(s+e.status+e.responseText+"...")},complete:function(e,s){}})}function display_interest_groups_loading_spinner(e){jQuery(e).parents("label").append('<p class="interest-groups-loading">'+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span> \r\t\t\t<span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span> \r\t\t\t<img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /> \r\t\t</p>')}function shouldWeDisplayCustomURL(e){"custom_url"==jQuery(e).val()?jQuery(".custom_redirect_url_label").fadeIn():jQuery(".custom_redirect_url_label").fadeOut()}function show_custom_messages_based_on_optin_settings(){show_custom_resub_messages_based_on_optin_settings(),show_custom_success_messages_based_on_optin_settings()}function yikes_mc_hide_custom_resub_messages(){jQuery(".yikes-easy-mc-custom-messages-email-section, .yikes-easy-mc-custom-messages-email-section-help").fadeOut(),jQuery('label[for="yikes-easy-mc-user-resubscribed-success-message"], label[for="yikes-easy-mc-user-subscribed-message"], \r\t\t\tlabel[for="yikes-easy-mc-user-subscribed-update-link"]').hide(),jQuery(".yikes-easy-mc-user-resubscribed-success-message-help, .yikes-easy-mc-user-subscribed-message-help, \r\t\t\t.yikes-easy-mc-user-subscribed-update-link-help").hide(),jQuery('label[for="yikes-easy-mc-update-email-successful"], label[for="yikes-easy-mc-update-email-failure"], \r\t\t\t .yikes-easy-mc-update-email-successful-help, .yikes-easy-mc-update-email-failure-help').hide()}function yikes_mc_hide_custom_optin_messages(){jQuery('label[for="yikes-easy-mc-success-single-optin-message"], label[for="yikes-easy-mc-success-message"]').hide(),jQuery(".yikes-easy-mc-success-single-optin-message-help, .yikes-easy-mc-success-message-help").hide()}function show_custom_resub_messages_based_on_optin_settings(){yikes_mc_hide_custom_resub_messages();var e=jQuery("#update-user").is(":checked"),s=jQuery("#update-email").is(":checked");!1===e&&jQuery('label[for="yikes-easy-mc-user-subscribed-message"], .yikes-easy-mc-user-subscribed-message-help').fadeIn(),!0===e&&!0===s&&jQuery('label[for="yikes-easy-mc-user-subscribed-update-link"], .yikes-easy-mc-custom-messages-email-section, \r\t\t\t\t.yikes-easy-mc-user-subscribed-update-link-help, .yikes-easy-mc-custom-messages-email-section-help, \r\t\t\t\tlabel[for="yikes-easy-mc-update-email-successful"], label[for="yikes-easy-mc-update-email-failure"], \r\t\t\t\t.yikes-easy-mc-update-email-successful-help, .yikes-easy-mc-update-email-failure-help').fadeIn(),!0===e&&!1===s&&jQuery('label[for="yikes-easy-mc-user-resubscribed-success-message"], .yikes-easy-mc-user-resubscribed-success-message-help').fadeIn()}function show_custom_success_messages_based_on_optin_settings(){yikes_mc_hide_custom_optin_messages(),!0===jQuery("#single").is(":checked")?(jQuery('label[for="yikes-easy-mc-success-single-optin-message"], .yikes-easy-mc-success-single-optin-message-help ').fadeIn(),jQuery("#yikes-tags-error-message").fadeOut("slow",function(){jQuery(this).addClass("hidden")})):(jQuery('label[for="yikes-easy-mc-success-message"], .yikes-easy-mc-success-message-help').fadeIn(),jQuery("#yikes-tags-error-message").fadeIn("slow",function(){jQuery(this).removeClass("hidden")}))}!function(e){"use strict";e(document).ready(function(){show_custom_messages_based_on_optin_settings(),e('input[name="update-existing-user"]').change(show_custom_resub_messages_based_on_optin_settings),e('input[name="update-existing-email"]').change(show_custom_resub_messages_based_on_optin_settings),e('input[name="single-double-optin"]').change(show_custom_success_messages_based_on_optin_settings),e("body").on("click",".view-yikes-mc-form-shortcode",function(){var e=jQuery(this);jQuery(this).parents("tr").find(".form-id-container").text();return e.parents("tr").find(".stat-container").toggleClass("hidden-class"),e.parents("tr").find(".shortcode").toggleClass("hidden-class"),e.toggleText(),!1}),e("body").on("click",".disabled",function(){return!1}),e("body").hasClass("admin_page_yikes-mailchimp-edit-form")||e(".show-some-love-container").css("max-height",jQuery(".show-some-love-container").height()),e(".checkbox-settings-list-item").click(function(){jQuery(this).is(":checked")?display_interest_groups_for_list_checkbox_integrations(this):remove_interest_groups_for_list_checkbox_integrations(this)}),e("body").on("click",".yikes-mailchimp-toggle-ig",function(){var s=e(this);s.hasClass("dashicons-arrow-down-alt2")?(s.siblings(".integration-checkbox-interest-groups-interior").slideUp(),s.removeClass("dashicons-arrow-down-alt2").addClass("dashicons-arrow-right-alt2")):(s.siblings(".integration-checkbox-interest-groups-interior").slideDown(),s.removeClass("dashicons-arrow-right-alt2").addClass("dashicons-arrow-down-alt2"))}),e("body").on("click",".about-yikes-inc-toggle",function(){if(jQuery(this).toggleText(),jQuery(".show-some-love-container").find("h3").toggleText(),jQuery(this).hasClass("show-yikes-some-love-toggle")){jQuery(this).removeClass("show-yikes-some-love-toggle");var e=jQuery(".show-some-love-container").find("h3").first().height()+24,s=jQuery("#review-yikes-easy-mc").height()+24,t=jQuery(".sidebar-footer-text").first().height()+12,i=jQuery(".sidebar-footer-text").last().height()+13,a=parseInt(e+s+t+i);return jQuery(".show-some-love-container").css("max-height",a),jQuery("#about-yikes-inc").fadeOut(720,function(){jQuery(".sidebar-footer-text").first().fadeIn(450),jQuery("#review-yikes-easy-mc").fadeIn(450)}),!1}jQuery(this).toggleClass("show-yikes-some-love-toggle");e=jQuery(".show-some-love-container").find("h3").first().height()+24;var r=jQuery("#about-yikes-inc").height()+18;i=jQuery(".sidebar-footer-text").last().height()+18,a=parseInt(e+r+i);return jQuery(".sidebar-footer-text").first().hide(),jQuery(".show-some-love-container").addClass("about-yikes-inc").css("max-height",a),jQuery("#about-yikes-inc").show().css("opacity",0),jQuery("#review-yikes-easy-mc").fadeOut("fast",function(){jQuery("#about-yikes-inc").fadeTo(800,1)}),!1}),e.fn.toggleText=function(){var e=this.data("alt-text");e&&(this.data("alt-text",this.html()),this.html(e))}})}(jQuery);
1
+ function YIKES_Easy_MC_SwitchForm(e){window.location.replace(object_data.admin_url+"admin.php?page=yikes-mailchimp-edit-form&id="+e)}function toggleOptinValue(e){"true"==e.value?jQuery(".yks-mailchimp-single-optin-message").slideUp("fast",function(){jQuery(".yks-mailchimp-double-optin-message").slideDown("fast")}):jQuery(".yks-mailchimp-double-optin-message").slideUp("fast",function(){jQuery(".yks-mailchimp-single-optin-message").slideDown("fast")})}function toggleDeleteSubscriberButton(e){e.prop("checked")?jQuery("#delete-mailchimp-subscriber").removeAttr("disabled"):jQuery("#delete-mailchimp-subscriber").attr("disabled","disabled")}function checkForInterestGroups(e,s,t){var i=e.parents("li").find(".interest-groups-container").children().length;if(0==i)e.parents("li").find(".interest-groups-container").append("<p>"+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span><img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /></p>');else{var a=1;e.parents("li").find(".interest-groups-container").children().each(function(){jQuery(this).fadeOut("fast",function(){jQuery(this).remove(),a==i&&e.parents("li").find(".interest-groups-container").append("<p>"+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span><img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /></p>'),console.log(a),a++})})}var r={action:"check_list_for_interest_groups",list_id:s,integration:t};jQuery.ajax({url:object_data.ajax_url,type:"POST",data:r,dataType:"html",success:function(s,t,i){setTimeout(function(){e.parents("li").find(".interest-groups-container").html(s)},500)},error:function(e,s,t){alert(s+e.status+e.responseText+"...")},complete:function(e,s){}}),console.log(s)}function remove_interest_groups_for_list_checkbox_integrations(e){jQuery(e).parents("label").next(".integration-checkbox-interest-groups").slideUp(function(){jQuery(this).remove()})}function display_interest_groups_for_list_checkbox_integrations(e){display_interest_groups_loading_spinner(e),fetch_interest_groups_by_list_id(jQuery(e).val(),jQuery(e).data("integration"),e)}function fetch_interest_groups_by_list_id(e,s,t){var i={action:"check_list_for_interest_groups",list_id:e,integration:s};jQuery.ajax({url:object_data.ajax_url,type:"POST",data:i,dataType:"html",success:function(e,s,i){jQuery(t).parents("label").children(".interest-groups-loading").remove(),jQuery(t).parents("label").after(e)},error:function(e,s,t){alert(s+e.status+e.responseText+"...")},complete:function(e,s){}})}function display_interest_groups_loading_spinner(e){jQuery(e).parents("label").append('<p class="interest-groups-loading">'+object_data.locating_interest_groups+'<span class="upgrading-ellipse-one">.</span> \r\t\t\t<span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</span> \r\t\t\t<img class="search-interest-group-preloader" src="'+object_data.preloader_url+'" /> \r\t\t</p>')}function shouldWeDisplayCustomURL(e){"custom_url"==jQuery(e).val()?jQuery(".custom_redirect_url_label").fadeIn():jQuery(".custom_redirect_url_label").fadeOut()}function show_custom_messages_based_on_optin_settings(){show_custom_resub_messages_based_on_optin_settings(),show_custom_success_messages_based_on_optin_settings()}function yikes_mc_hide_custom_resub_messages(){jQuery(".yikes-easy-mc-custom-messages-email-section, .yikes-easy-mc-custom-messages-email-section-help").fadeOut(),jQuery('label[for="yikes-easy-mc-user-resubscribed-success-message"], label[for="yikes-easy-mc-user-subscribed-message"], \r\t\t\tlabel[for="yikes-easy-mc-user-subscribed-update-link"]').hide(),jQuery(".yikes-easy-mc-user-resubscribed-success-message-help, .yikes-easy-mc-user-subscribed-message-help, \r\t\t\t.yikes-easy-mc-user-subscribed-update-link-help").hide(),jQuery('label[for="yikes-easy-mc-update-email-successful"], label[for="yikes-easy-mc-update-email-failure"], \r\t\t\t .yikes-easy-mc-update-email-successful-help, .yikes-easy-mc-update-email-failure-help').hide()}function yikes_mc_hide_custom_optin_messages(){jQuery('label[for="yikes-easy-mc-success-single-optin-message"], label[for="yikes-easy-mc-success-message"]').hide(),jQuery(".yikes-easy-mc-success-single-optin-message-help, .yikes-easy-mc-success-message-help").hide()}function show_custom_resub_messages_based_on_optin_settings(){yikes_mc_hide_custom_resub_messages();var e=jQuery("#update-user").is(":checked"),s=jQuery("#update-email").is(":checked");!1===e&&jQuery('label[for="yikes-easy-mc-user-subscribed-message"], .yikes-easy-mc-user-subscribed-message-help').fadeIn(),!0===e&&!0===s&&jQuery('label[for="yikes-easy-mc-user-subscribed-update-link"], .yikes-easy-mc-custom-messages-email-section, \r\t\t\t\t.yikes-easy-mc-user-subscribed-update-link-help, .yikes-easy-mc-custom-messages-email-section-help, \r\t\t\t\tlabel[for="yikes-easy-mc-update-email-successful"], label[for="yikes-easy-mc-update-email-failure"], \r\t\t\t\t.yikes-easy-mc-update-email-successful-help, .yikes-easy-mc-update-email-failure-help').fadeIn(),!0===e&&!1===s&&jQuery('label[for="yikes-easy-mc-user-resubscribed-success-message"], .yikes-easy-mc-user-resubscribed-success-message-help').fadeIn()}function show_custom_success_messages_based_on_optin_settings(){yikes_mc_hide_custom_optin_messages(),!0===jQuery("#single").is(":checked")?(jQuery('label[for="yikes-easy-mc-success-single-optin-message"], .yikes-easy-mc-success-single-optin-message-help ').fadeIn(),jQuery("#yikes-tags-error-message").fadeOut("slow",function(){jQuery(this).addClass("hidden")})):(jQuery('label[for="yikes-easy-mc-success-message"], .yikes-easy-mc-success-message-help').fadeIn(),jQuery("#yikes-tags-error-message").fadeIn("slow",function(){jQuery(this).removeClass("hidden")}))}!function(e){"use strict";e(document).ready(function(){show_custom_messages_based_on_optin_settings(),e('input[name="update-existing-user"]').change(show_custom_resub_messages_based_on_optin_settings),e('input[name="update-existing-email"]').change(show_custom_resub_messages_based_on_optin_settings),e('input[name="single-double-optin"]').change(show_custom_success_messages_based_on_optin_settings),e("body").on("click",".view-yikes-mc-form-shortcode",function(){var e=jQuery(this);jQuery(this).parents("tr").find(".form-id-container").text();return e.parents("tr").find(".stat-container").toggleClass("hidden-class"),e.parents("tr").find(".shortcode").toggleClass("hidden-class"),e.toggleText(),!1}),e("body").on("click",".yikes-easy-mc-wrap .disabled",function(){return!1}),e("body").hasClass("admin_page_yikes-mailchimp-edit-form")||e(".show-some-love-container").css("max-height",jQuery(".show-some-love-container").height()),e(".checkbox-settings-list-item").click(function(){jQuery(this).is(":checked")?display_interest_groups_for_list_checkbox_integrations(this):remove_interest_groups_for_list_checkbox_integrations(this)}),e("body").on("click",".yikes-mailchimp-toggle-ig",function(){var s=e(this);s.hasClass("dashicons-arrow-down-alt2")?(s.siblings(".integration-checkbox-interest-groups-interior").slideUp(),s.removeClass("dashicons-arrow-down-alt2").addClass("dashicons-arrow-right-alt2")):(s.siblings(".integration-checkbox-interest-groups-interior").slideDown(),s.removeClass("dashicons-arrow-right-alt2").addClass("dashicons-arrow-down-alt2"))}),e("body").on("click",".about-yikes-inc-toggle",function(){if(jQuery(this).toggleText(),jQuery(".show-some-love-container").find("h3").toggleText(),jQuery(this).hasClass("show-yikes-some-love-toggle")){jQuery(this).removeClass("show-yikes-some-love-toggle");var e=jQuery(".show-some-love-container").find("h3").first().height()+24,s=jQuery("#review-yikes-easy-mc").height()+24,t=jQuery(".sidebar-footer-text").first().height()+12,i=jQuery(".sidebar-footer-text").last().height()+13,a=parseInt(e+s+t+i);return jQuery(".show-some-love-container").css("max-height",a),jQuery("#about-yikes-inc").fadeOut(720,function(){jQuery(".sidebar-footer-text").first().fadeIn(450),jQuery("#review-yikes-easy-mc").fadeIn(450)}),!1}jQuery(this).toggleClass("show-yikes-some-love-toggle");e=jQuery(".show-some-love-container").find("h3").first().height()+24;var r=jQuery("#about-yikes-inc").height()+18;i=jQuery(".sidebar-footer-text").last().height()+18,a=parseInt(e+r+i);return jQuery(".sidebar-footer-text").first().hide(),jQuery(".show-some-love-container").addClass("about-yikes-inc").css("max-height",a),jQuery("#about-yikes-inc").show().css("opacity",0),jQuery("#review-yikes-easy-mc").fadeOut("fast",function(){jQuery("#about-yikes-inc").fadeTo(800,1)}),!1}),e.fn.toggleText=function(){var e=this.data("alt-text");e&&(this.data("alt-text",this.html()),this.html(e))}})}(jQuery);
admin/js/yikes-inc-easy-mailchimp-extender-admin.js CHANGED
@@ -1 +1 @@
1
- (function( $ ) {
1
+ (function( $ ) {
admin/partials/edit-form.php CHANGED
@@ -1,4 +1,4 @@
1
- <div class="wrap">
2
  <?php
3
 
4
  // If an error was returned.
1
+ <div class="wrap yikes-easy-mc-wrap">
2
  <?php
3
 
4
  // If an error was returned.
admin/partials/menu/add-ons.php CHANGED
@@ -4,7 +4,7 @@
4
  * @since 6.0.0
5
  */
6
  ?>
7
- <div class="wrap">
8
 
9
  <!-- Freddie Logo -->
10
  <img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
4
  * @since 6.0.0
5
  */
6
  ?>
7
+ <div class="wrap yikes-easy-mc-wrap">
8
 
9
  <!-- Freddie Logo -->
10
  <img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
admin/partials/menu/manage-forms.php CHANGED
@@ -21,7 +21,7 @@ if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
21
  $list_data = array();
22
  }
23
  ?>
24
- <div class="wrap">
25
  <!-- Freddie Logo -->
26
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
27
 
21
  $list_data = array();
22
  }
23
  ?>
24
+ <div class="wrap yikes-easy-mc-wrap">
25
  <!-- Freddie Logo -->
26
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
27
 
admin/partials/menu/manage-lists.php CHANGED
@@ -34,7 +34,7 @@ if ( is_wp_error( $list_data ) ) {
34
 
35
 
36
  ?>
37
- <div class="wrap">
38
  <!-- Freddie Logo -->
39
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
40
 
34
 
35
 
36
  ?>
37
+ <div class="wrap yikes-easy-mc-wrap">
38
  <!-- Freddie Logo -->
39
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
40
 
admin/partials/menu/options.php CHANGED
@@ -28,7 +28,7 @@
28
  }
29
  ?>
30
  <!-- Actual Settings Form -->
31
- <div class="wrap">
32
 
33
  <!-- Freddie Logo -->
34
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
28
  }
29
  ?>
30
  <!-- Actual Settings Form -->
31
+ <div class="wrap yikes-easy-mc-wrap">
32
 
33
  <!-- Freddie Logo -->
34
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
admin/partials/menu/support.php CHANGED
@@ -6,7 +6,7 @@
6
  * By: Yikes Inc. | https://www.yikesinc.com
7
  */
8
  ?>
9
- <div class="wrap yikes-easy-mc-support-wrap">
10
 
11
  <!-- Freddie Logo -->
12
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
6
  * By: Yikes Inc. | https://www.yikesinc.com
7
  */
8
  ?>
9
+ <div class="wrap yikes-easy-mc-support-wrap yikes-easy-mc-wrap">
10
 
11
  <!-- Freddie Logo -->
12
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
admin/partials/view-list.php CHANGED
@@ -88,7 +88,7 @@ if ( (int) $total_pages === 0 ) {
88
  $subscribers_list = array_slice( $members, $page_offset, $limit );
89
 
90
  ?>
91
- <div class="wrap">
92
  <!-- Freddie Logo -->
93
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
94
 
88
  $subscribers_list = array_slice( $members, $page_offset, $limit );
89
 
90
  ?>
91
+ <div class="wrap yikes-easy-mc-wrap">
92
  <!-- Freddie Logo -->
93
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
94
 
admin/partials/view-user.php CHANGED
@@ -106,7 +106,7 @@ $list_name = $additional_lists[ $list_id ];
106
 
107
  // Generate our display page
108
  ?>
109
- <div class="wrap view-user-data-wrap">
110
  <!-- Freddie Logo -->
111
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
112
 
106
 
107
  // Generate our display page
108
  ?>
109
+ <div class="wrap view-user-data-wrap yikes-easy-mc-wrap">
110
  <!-- Freddie Logo -->
111
  <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
112
 
includes/class-yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -124,8 +124,7 @@ class Yikes_Inc_Easy_Mailchimp_Extender {
124
  private function define_admin_hooks() {
125
  $plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );
126
  $plugin_admin->hooks();
127
- $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
128
- $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
129
  }
130
  /**
131
  * Register all of the hooks related to the public-facing functionality
124
  private function define_admin_hooks() {
125
  $plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );
126
  $plugin_admin->hooks();
127
+ $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'maybe_enqueue_assets' );
 
128
  }
129
  /**
130
  * Register all of the hooks related to the public-facing functionality
public/js/yikes-datepicker-scripts.min.js CHANGED
@@ -1 +1 @@
1
- !function(t){function e(t){return{dateFormat:t,isRTL:datepicker_settings.rtl,dayNames:datepicker_settings.day_names,dayNamesMin:datepicker_settings.day_names_min,dayNamesShort:datepicker_settings.day_names_short,monthNames:datepicker_settings.month_names,monthNamesShort:datepicker_settings.month_names_short,firstDay:datepicker_settings.first_day,changeMonth:datepicker_settings.change_month,changeYear:datepicker_settings.change_year,yearRange:datepicker_settings.year_range,minDate:datepicker_settings.min_date,maxDate:datepicker_settings.max_date,defaultDate:datepicker_settings.default_date,numberOfMonths:"string"==typeof datepicker_settings.number_of_months?parseInt(datepicker_settings.number_of_months):datepicker_settings.number_of_months,showOtherMonths:datepicker_settings.show_other_months,selectOtherMonths:datepicker_settings.select_other_months,showAnim:datepicker_settings.show_anim,showButtonPanel:datepicker_settings.show_button_panel,beforeShowDay:"function"==typeof yikes_mc_before_show_day?yikes_mc_before_show_day:null}}function a(e,a){t(a).each(function(){this.id.length&&t(this).data("id",this.id)}),t(a).attr("id",""),e.attr("id",e.data("id"))}t(document).ready(function(){t("body").on("focus",'input[data-attr-type="date"]',function(){const s=t(this);a(s,'input[data-attr-type="date"]'),s.datepicker(e(s.data("date-format").replace("yyyy","yy"))),t("#ui-datepicker-div").removeClass("yikes-datepicker-hide-year")}),t("body").on("focus",'input[data-attr-type="birthday"]',function(){const s=t(this);a(s,'input[data-attr-type="birthday"]'),s.datepicker(e(s.data("date-format"))),t("#ui-datepicker-div").addClass("yikes-datepicker-hide-year")})})}(jQuery);
1
+ !function(t){function e(t){return{dateFormat:t,isRTL:datepicker_settings.rtl,dayNames:datepicker_settings.day_names,dayNamesMin:datepicker_settings.day_names_min,dayNamesShort:datepicker_settings.day_names_short,monthNames:datepicker_settings.month_names,monthNamesShort:datepicker_settings.month_names_short,firstDay:datepicker_settings.first_day,changeMonth:datepicker_settings.change_month,changeYear:datepicker_settings.change_year,yearRange:datepicker_settings.year_range,minDate:datepicker_settings.min_date,maxDate:datepicker_settings.max_date,defaultDate:datepicker_settings.default_date,numberOfMonths:"string"==typeof datepicker_settings.number_of_months?parseInt(datepicker_settings.number_of_months):datepicker_settings.number_of_months,showOtherMonths:datepicker_settings.show_other_months,selectOtherMonths:datepicker_settings.select_other_months,showAnim:datepicker_settings.show_anim,showButtonPanel:datepicker_settings.show_button_panel,beforeShowDay:"function"==typeof yikes_mc_before_show_day?yikes_mc_before_show_day:null}}function a(e,a){t(a).each(function(){this.id.length&&t(this).data("id",this.id)}),t(a).attr("id",""),e.attr("id",e.data("id"))}t(document).ready(function(){t("body").on("focus",'input[data-attr-type="date"]',function(){const s=t(this);a(s,'input[data-attr-type="date"]'),s.datepicker(e(s.data("date-format").replace("yyyy","yy"))),t("#ui-datepicker-div").removeClass("yikes-datepicker-hide-year")}),t("body").on("focus",'input[data-attr-type="birthday"]',function(){const s=t(this);a(s,'input[data-attr-type="birthday"]'),s.datepicker(e(s.data("date-format"))),t("#ui-datepicker-div").addClass("yikes-datepicker-hide-year")})})}(jQuery);
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: Mailchimp, Mailchimp forms, Mailchimp lists, opt-in forms, sign up form, M
5
  Requires at least: 4.0
6
  Tested up to: 5.7
7
  Requires PHP: 5.2.13
8
- Stable tag: 6.8.3
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -172,6 +172,9 @@ For information and code examples on how to implement the hooks and filters prov
172
 
173
  == Changelog ==
174
 
 
 
 
175
  = 6.8.3 - March 4, 2021 =
176
  * Rename assets folder
177
 
5
  Requires at least: 4.0
6
  Tested up to: 5.7
7
  Requires PHP: 5.2.13
8
+ Stable tag: 6.8.4
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
172
 
173
  == Changelog ==
174
 
175
+ = 6.8.4 - April 12, 2021 =
176
+ * Increase specifity of admin asset inclusion to prevent conflicts with other plugins.
177
+
178
  = 6.8.3 - March 4, 2021 =
179
  * Rename assets folder
180
 
yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Easy Forms for Mailchimp
4
  * Plugin URI: https://yikesplugins.com/plugin/easy-forms-for-mailchimp/
5
  * Description: The ultimate Mailchimp WordPress plugin. Easily build <strong>unlimited forms for your Mailchimp lists</strong>, add them to your site and track subscriber activity. To get started, go to the settings page and enter your <a href="https://yikesplugins.com/support/knowledge-base/finding-your-mailchimp-api-key/" target="_blank">Mailchimp API key</a>.
6
- * Version: 6.8.3
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
@@ -42,7 +42,7 @@ if ( ! defined( 'WPINC' ) ) {
42
  * @since 6.1.3
43
  */
44
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
45
- define( 'YIKES_MC_VERSION', '6.8.3' );
46
  }
47
 
48
  /**
3
  * Plugin Name: Easy Forms for Mailchimp
4
  * Plugin URI: https://yikesplugins.com/plugin/easy-forms-for-mailchimp/
5
  * Description: The ultimate Mailchimp WordPress plugin. Easily build <strong>unlimited forms for your Mailchimp lists</strong>, add them to your site and track subscriber activity. To get started, go to the settings page and enter your <a href="https://yikesplugins.com/support/knowledge-base/finding-your-mailchimp-api-key/" target="_blank">Mailchimp API key</a>.
6
+ * Version: 6.8.4
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
42
  * @since 6.1.3
43
  */
44
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
45
+ define( 'YIKES_MC_VERSION', '6.8.4' );
46
  }
47
 
48
  /**