Changeset 2044994
- Timestamp:
- 03/06/2019 04:43:42 AM (7 years ago)
- Location:
- mailchimp-wp/trunk
- Files:
-
- 2 deleted
- 9 edited
-
assets/script.js (modified) (4 diffs)
-
assets/script.min.js (modified) (1 diff)
-
assets/style-new.css (modified) (2 diffs)
-
assets/style-new.min.css (modified) (1 diff)
-
includes/eoi-functions.php (modified) (2 diffs)
-
includes/eoi-pointer.php (deleted)
-
includes/eoi-post-types.php (modified) (3 diffs)
-
includes/eoi-tour-pointer.php (deleted)
-
mailchimp-wp.php (modified) (4 diffs)
-
providers/mailchimp/functions.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mailchimp-wp/trunk/assets/script.js
r1903290 r2044994 111 111 has_error = true; 112 112 } 113 113 114 // Exit if honeypot is entered 115 if( $( '[name=i_agree]', $this ).prop( 'checked' ) ) { 116 return false; 117 } 118 114 119 // Exit if there is any error 115 120 if( has_error ) { … … 141 146 theme: ['tooltipster-borderless', 'tooltipster-optin-cat'] 142 147 } ).tooltipster( 'content', fcaEoiScriptData.field_required ).tooltipster( 'show' ) 143 148 return false 144 149 } 145 150 … … 153 158 154 159 $.ajax({ 160 type: 'POST', 155 161 url: fcaEoiScriptData.ajax_url, 156 162 data: { … … 163 169 'timezone': tz.name(), 164 170 'consent_granted': gdpr_consent 165 }, 166 type: 'POST', 167 datatype: 'text', 168 timeout: 15000 171 } 169 172 }).done( function( data ) { 170 173 -
mailchimp-wp/trunk/assets/script.min.js
r1903290 r2044994 1 jQuery(document).ready(function(t){function e(t,e,i){if(0===i)document.cookie=t+"="+e+";path=/;";else{var a=new Date;a.setTime(a.getTime()+24*i*60*60*1e3),document.cookie=t+"="+e+";path=/;expires="+a.toUTCString()}}t(document).on("submit",".fca_eoi_form",function(i){i.preventDefault();var a,o=t(this),n=t("[name=email]",o),r=t("[name=name]",o),c=r.val(),l=n.val(),_=o.data("fca_eoi_list_id"),s=t("[type=submit]",o),d=o.data("fca_eoi_thank_you_mode"),p=o.data("fca_eoi_thank_you_page"),f=o.data("fca_eoi_success_cookie_duration"),u=o.data("fca_eoi_sub_msg"),m=!1,h=t("[name=fca_eoi_form_id]",o).val();if(o.find(".tooltipstered").tooltipster("hide"),t("[name=email], [name=name]",o).not(".tooltipstered").each(function(){var e=t(this),i=.8*e.width();e.tooltipster({contentAsHTML:!0,fixedWidth:i,minWidth:i,maxWidth:i,trigger:"none",theme:["tooltipster-borderless","tooltipster-optin-cat"]})}),t("[name=email], [name=name]",t(this)).focus(function(){var e=t(this),i=t("[type=submit]",e.closest(".fca_eoi_form")),a=i.data("fca_eoi_initial_val");void 0!==a&&i.val(a),t(this).tooltipster("hide")}),s.data("fca_eoi_initial_val")?a=s.data("fca_eoi_initial_val"):(a=s.val(),s.data("fca_eoi_initial_val",a)),s.val(a),fcaEoiScriptData.invalid_email=o.find(".fca_eoi_error_texts_email").val(),fcaEoiScriptData.field_required=o.find(".fca_eoi_error_texts_required").val(),l&&function(t){return/^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(t)}(l)||(n.tooltipster("content",l?fcaEoiScriptData.invalid_email:fcaEoiScriptData.field_required),n.tooltipster("show"),s.val("✗ "+a),m=!0),r.is(":visible")&&!c&&(r.tooltipster("content",fcaEoiScriptData.field_required),r.tooltipster("show"),s.val("✗ "+a),m=!0), m)return!1;var v="unknown";if(fcaEoiScriptData.gdpr_checkbox){if(0===o.find(".fca_eoi_gdpr_consent").length)return o.find(".fca_eoi_layout_field_wrapper").hide(),o.find(".fca_eoi_layout_email_field_inner").hide(),o.find(".fca_eoi_layout_name_field_inner").hide(),o.closest(".fca_eoi_form_wrapper ").hasClass("fca_eoi_layout_banner_wrapper")?(o.find(".fca_eoi_layout_headline_copy_wrapper")[0].style.setProperty("display","block","important"),o.find(".fca_eoi_layout_headline_copy_wrapper").html('<div style="font-size: 14px;">'+fcaEoiScriptData.consent_headline+'<br><label><input class="fca_eoi_gdpr_consent" value="" type="checkbox"></input>'+fcaEoiScriptData.consent_msg+"</label></div>")):(o.find(".fca_eoi_layout_description_copy_wrapper")[0].style.setProperty("display","block","important"),o.find(".fca_eoi_layout_description_copy_wrapper").html('<div style="text-align:left;">'+fcaEoiScriptData.consent_headline+'<br><br><label><input class="fca_eoi_gdpr_consent" value="" type="checkbox"></input>'+fcaEoiScriptData.consent_msg+"</label></div>")),!1;0==(v=o.find(".fca_eoi_gdpr_consent").prop("checked"))&&o.find(".fca_eoi_gdpr_consent").not(".tooltipstered").tooltipster({contentAsHTML:!0,trigger:"none",theme:["tooltipster-borderless","tooltipster-optin-cat"]}).tooltipster("content",fcaEoiScriptData.field_required).tooltipster("show")}s.val(u),s.prop("disabled",!0);var y=jstz.determine();t.ajax({url:fcaEoiScriptData.ajax_url,data:{email:l,name:c,action:"fca_eoi_subscribe",list_id:_,form_id:h,nonce:fcaEoiScriptData.nonce,timezone:y.name(),consent_granted:v},type:"POST",datatype:"text",timeout:15e3}).done(function(i){if("✓"===i){s.val(i+" "+a),e("fca_eoi_success_"+h,Math.floor(Date.now()/1e3),f);var c=JSON.parse(function(t){var e=("; "+document.cookie).split("; "+t+"=");return 2===e.length&&e.pop().split(";").shift()}("fca_eoi_active_optins"));Array.isArray(c)||(c=[]);var l=c.indexOf(h);-1!==l&&c.splice(l,1),e("fca_eoi_active_optins",JSON.stringify(c))}else"✗ Failed to add user - denied"===i?(s.prop("disabled",!1),s.val(a),o.find(".fca_eoi_gdpr_consent").tooltipster("show")):(s.prop("disabled",!1),s.val(i));"ajax"===d&&"✓"===i?(clearInterval(!1),p&&"✓"===i&&(tooltipWidth=s.width(),s.tooltipster({contentAsHTML:!0,trigger:"none",fixedWidth:tooltipWidth,minWidth:tooltipWidth,maxWidth:tooltipWidth,arrow:!1,theme:["tooltipster-borderless","tooltipster-optin-cat"]}),s.tooltipster("content",p),s.tooltipster("show"),n.prop("disabled",!0),r.prop("disabled",!0),t(".tooltipster-content").css("background-color","#148544"))):"✓"===i&&(window.location.href=p)})})});1 jQuery(document).ready(function(t){function e(t,e,i){if(0===i)document.cookie=t+"="+e+";path=/;";else{var a=new Date;a.setTime(a.getTime()+24*i*60*60*1e3),document.cookie=t+"="+e+";path=/;expires="+a.toUTCString()}}t(document).on("submit",".fca_eoi_form",function(i){i.preventDefault();var a,o=t(this),n=t("[name=email]",o),r=t("[name=name]",o),c=r.val(),l=n.val(),_=o.data("fca_eoi_list_id"),s=t("[type=submit]",o),d=o.data("fca_eoi_thank_you_mode"),p=o.data("fca_eoi_thank_you_page"),f=o.data("fca_eoi_success_cookie_duration"),u=o.data("fca_eoi_sub_msg"),m=!1,h=t("[name=fca_eoi_form_id]",o).val();if(o.find(".tooltipstered").tooltipster("hide"),t("[name=email], [name=name]",o).not(".tooltipstered").each(function(){var e=t(this),i=.8*e.width();e.tooltipster({contentAsHTML:!0,fixedWidth:i,minWidth:i,maxWidth:i,trigger:"none",theme:["tooltipster-borderless","tooltipster-optin-cat"]})}),t("[name=email], [name=name]",t(this)).focus(function(){var e=t(this),i=t("[type=submit]",e.closest(".fca_eoi_form")),a=i.data("fca_eoi_initial_val");void 0!==a&&i.val(a),t(this).tooltipster("hide")}),s.data("fca_eoi_initial_val")?a=s.data("fca_eoi_initial_val"):(a=s.val(),s.data("fca_eoi_initial_val",a)),s.val(a),fcaEoiScriptData.invalid_email=o.find(".fca_eoi_error_texts_email").val(),fcaEoiScriptData.field_required=o.find(".fca_eoi_error_texts_required").val(),l&&function(t){return/^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(t)}(l)||(n.tooltipster("content",l?fcaEoiScriptData.invalid_email:fcaEoiScriptData.field_required),n.tooltipster("show"),s.val("✗ "+a),m=!0),r.is(":visible")&&!c&&(r.tooltipster("content",fcaEoiScriptData.field_required),r.tooltipster("show"),s.val("✗ "+a),m=!0),t("[name=i_agree]",o).prop("checked"))return!1;if(m)return!1;var v="unknown";if(fcaEoiScriptData.gdpr_checkbox){if(0===o.find(".fca_eoi_gdpr_consent").length)return o.find(".fca_eoi_layout_field_wrapper").hide(),o.find(".fca_eoi_layout_email_field_inner").hide(),o.find(".fca_eoi_layout_name_field_inner").hide(),o.closest(".fca_eoi_form_wrapper ").hasClass("fca_eoi_layout_banner_wrapper")?(o.find(".fca_eoi_layout_headline_copy_wrapper")[0].style.setProperty("display","block","important"),o.find(".fca_eoi_layout_headline_copy_wrapper").html('<div style="font-size: 14px;">'+fcaEoiScriptData.consent_headline+'<br><label><input class="fca_eoi_gdpr_consent" value="" type="checkbox"></input>'+fcaEoiScriptData.consent_msg+"</label></div>")):(o.find(".fca_eoi_layout_description_copy_wrapper")[0].style.setProperty("display","block","important"),o.find(".fca_eoi_layout_description_copy_wrapper").html('<div style="text-align:left;">'+fcaEoiScriptData.consent_headline+'<br><br><label><input class="fca_eoi_gdpr_consent" value="" type="checkbox"></input>'+fcaEoiScriptData.consent_msg+"</label></div>")),!1;if(0==(v=o.find(".fca_eoi_gdpr_consent").prop("checked")))return o.find(".fca_eoi_gdpr_consent").not(".tooltipstered").tooltipster({contentAsHTML:!0,trigger:"none",theme:["tooltipster-borderless","tooltipster-optin-cat"]}).tooltipster("content",fcaEoiScriptData.field_required).tooltipster("show"),!1}s.val(u),s.prop("disabled",!0);var y=jstz.determine();t.ajax({type:"POST",url:fcaEoiScriptData.ajax_url,data:{email:l,name:c,action:"fca_eoi_subscribe",list_id:_,form_id:h,nonce:fcaEoiScriptData.nonce,timezone:y.name(),consent_granted:v}}).done(function(i){if("✓"===i){s.val(i+" "+a),e("fca_eoi_success_"+h,Math.floor(Date.now()/1e3),f);var c=JSON.parse(function(t){var e=("; "+document.cookie).split("; "+t+"=");return 2===e.length&&e.pop().split(";").shift()}("fca_eoi_active_optins"));Array.isArray(c)||(c=[]);var l=c.indexOf(h);-1!==l&&c.splice(l,1),e("fca_eoi_active_optins",JSON.stringify(c))}else"✗ Failed to add user - denied"===i?(s.prop("disabled",!1),s.val(a),o.find(".fca_eoi_gdpr_consent").tooltipster("show")):(s.prop("disabled",!1),s.val(i));"ajax"===d&&"✓"===i?(clearInterval(!1),p&&"✓"===i&&(tooltipWidth=s.width(),s.tooltipster({contentAsHTML:!0,trigger:"none",fixedWidth:tooltipWidth,minWidth:tooltipWidth,maxWidth:tooltipWidth,arrow:!1,theme:["tooltipster-borderless","tooltipster-optin-cat"]}),s.tooltipster("content",p),s.tooltipster("show"),n.prop("disabled",!0),r.prop("disabled",!0),t(".tooltipster-content").css("background-color","#148544"))):"✓"===i&&(window.location.href=p)})})}); -
mailchimp-wp/trunk/assets/style-new.css
r1991436 r2044994 10 10 color: white; 11 11 } 12 .tooltipster-arrow-border { 13 border-top-color: #DE607C !important; 12 13 .tooltipster-optin-cat.tooltipster-sidetip.tooltipster-top .tooltipster-arrow-border { 14 border-top-color: #DE607C; 14 15 } 15 16 … … 93 94 padding-left: 4px; 94 95 } 96 97 input[name='i_agree'].fca_eoi_form_input_element { 98 position: relative; 99 left: -99999px; 100 margin-bottom: -33px !important; 101 float: left; 102 } -
mailchimp-wp/trunk/assets/style-new.min.css
r1991436 r2044994 1 .tooltipster-sidetip.tooltipster-borderless.tooltipster-optin-cat .tooltipster-box{background-color:#de607c;border-radius:5px;margin-top:10px;font-size:14px;font-family:sans-serif}.tooltipster-sidetip.tooltipster-borderless.tooltipster-optin-cat-admin .tooltipster-box{background-color:#555;color:#fff}.tooltipster- arrow-border{border-top-color:#de607c!important}.fca_eoi_featherlight{z-index:9999998;cursor:initial;background:rgba(0,0,0,.8)}.fca_eoi_featherlight .featherlight-content{background-color:transparent;padding:0;overflow:visible!important}.fca_eoi_featherlight-close{display:none}div.fca_eoi_layout_postbox_wrapper{text-align:center;width:100%;margin-bottom:16px}input.fca_eoi_gdpr_consent{cursor:pointer;margin:0 5px 0 0;position:relative;top:2px}.fca_eoi_layout_popup,.fca_eoi_layout_postbox,.fca_eoi_layout_widget{width:100%;font-family:sans-serif;text-align:center;border:1px solid transparent}div.fca_eoi_layout_description_copy_wrapper label,div.fca_eoi_layout_headline_copy_wrapper label{cursor:pointer;color:inherit;display:inline;font-weight:400;margin:0}.fca_eoi_form_content,.fca_eoi_form_wrapper{margin:0;padding:0}.fca_eoi_form_content a,.fca_eoi_form_wrapper a{text-decoration:underline}.fca-eoi-gutenblock-select{padding-right:2px;border-top:1px solid #e2e4e7;border-bottom:1px solid #e2e4e7;background-color:#fff}.fca-eoi-gutenblock-select .components-base-control__field{margin-bottom:0;margin-top:3px;margin-left:4px}a.fca-eoi-gutenblock-link{background-color:#fff;border-top:1px solid #e2e4e7;border-bottom:1px solid #e2e4e7;margin-bottom:0;padding-top:3px;padding-left:4px}1 .tooltipster-sidetip.tooltipster-borderless.tooltipster-optin-cat .tooltipster-box{background-color:#de607c;border-radius:5px;margin-top:10px;font-size:14px;font-family:sans-serif}.tooltipster-sidetip.tooltipster-borderless.tooltipster-optin-cat-admin .tooltipster-box{background-color:#555;color:#fff}.tooltipster-optin-cat.tooltipster-sidetip.tooltipster-top .tooltipster-arrow-border{border-top-color:#de607c}.fca_eoi_featherlight{z-index:9999998;cursor:initial;background:rgba(0,0,0,.8)}.fca_eoi_featherlight .featherlight-content{background-color:transparent;padding:0;overflow:visible!important}.fca_eoi_featherlight-close{display:none}div.fca_eoi_layout_postbox_wrapper{text-align:center;width:100%;margin-bottom:16px}input.fca_eoi_gdpr_consent{cursor:pointer;margin:0 5px 0 0;position:relative;top:2px}.fca_eoi_layout_popup,.fca_eoi_layout_postbox,.fca_eoi_layout_widget{width:100%;font-family:sans-serif;text-align:center;border:1px solid transparent}div.fca_eoi_layout_description_copy_wrapper label,div.fca_eoi_layout_headline_copy_wrapper label{cursor:pointer;color:inherit;display:inline;font-weight:400;margin:0}.fca_eoi_form_content,.fca_eoi_form_wrapper{margin:0;padding:0}.fca_eoi_form_content a,.fca_eoi_form_wrapper a{text-decoration:underline}.fca-eoi-gutenblock-select{padding-right:2px;border-top:1px solid #e2e4e7;border-bottom:1px solid #e2e4e7;background-color:#fff}.fca-eoi-gutenblock-select .components-base-control__field{margin-bottom:0;margin-top:3px;margin-left:4px}a.fca-eoi-gutenblock-link{background-color:#fff;border-top:1px solid #e2e4e7;border-bottom:1px solid #e2e4e7;margin-bottom:0;padding-top:3px;padding-left:4px}input[name=i_agree].fca_eoi_form_input_element{position:relative;left:-99999px;margin-bottom:-33px!important;float:left} -
mailchimp-wp/trunk/includes/eoi-functions.php
r1945901 r2044994 163 163 $form_head .= "<input type='hidden' id='fca_eoi_form_id' name='fca_eoi_form_id' value='$form_id'>"; 164 164 165 166 $email_replace = '<input class="fca_eoi_form_input_element" type="email" name="email" placeholder="{{{email_placeholder}}}">'; 167 168 $options = get_option( 'fca_eoi_settings' ); 169 if ( !empty ( $options['honeypot'] ) && function_exists( 'fca_eoi_update_honeypot_html' ) ) { 170 $email_replace .= '<input class="fca_eoi_form_input_element" type="checkbox" name="i_agree">'; 171 } 172 165 173 //FILL TEMPLATE 166 174 $layout_html = str_replace( … … 183 191 K::get_var( 'image_input', $fca_eoi_meta, false ), 184 192 "<input class='fca_eoi_form_input_element' type='text' name='name' placeholder='{{{name_placeholder}}}'>", 185 '<input class="fca_eoi_form_input_element" type="email" name="email" placeholder="{{{email_placeholder}}}">',193 $email_replace, 186 194 '<input class="fca_eoi_form_button_element" type="submit" value="{{{button_copy}}}">', 187 195 '<div>{{{privacy_copy}}}</div>', -
mailchimp-wp/trunk/includes/eoi-post-types.php
r1880572 r2044994 1487 1487 'show_close', 1488 1488 'show_privacy_field', 1489 'push_page', 1489 'push_page', 1490 1490 ); 1491 1491 … … 1692 1692 $head = $css . '</style>'; 1693 1693 1694 $html = fca_eoi_get_html ( $form_id, $meta );1694 $html = fca_eoi_get_html( $form_id, $meta ); 1695 1695 1696 1696 $head = $head . $html; … … 2314 2314 wp_enqueue_script( 'fca_eoi_jstz', FCA_EOI_PLUGIN_URL . '/assets/vendor/jstz/jstz.min.js', array(), FCA_EOI_VER, true ); 2315 2315 2316 wp_enqueue_script( 'fca_eoi_script_js', FCA_EOI_PLUGIN_URL.'/assets/script.js', array( 'fca_eoi_jstz', 'jquery', 'fca_eoi_tooltipster_js', 'fca_eoi_featherlight_js' ), FCA_EOI_VER, true ); 2316 if( FCA_EOI_DEBUG ) { 2317 wp_enqueue_script( 'fca_eoi_script_js', FCA_EOI_PLUGIN_URL.'/assets/script.js', array( 'fca_eoi_jstz', 'jquery', 'fca_eoi_tooltipster_js', 'fca_eoi_featherlight_js' ), FCA_EOI_VER, true ); 2318 } else { 2319 wp_enqueue_script( 'fca_eoi_script_js', FCA_EOI_PLUGIN_URL.'/assets/script.min.js', array( 'fca_eoi_jstz', 'jquery', 'fca_eoi_tooltipster_js', 'fca_eoi_featherlight_js' ), FCA_EOI_VER, true ); 2320 } 2321 2317 2322 2318 2323 $options = get_option( 'fca_eoi_settings' ); -
mailchimp-wp/trunk/mailchimp-wp.php
r1991436 r2044994 5 5 Description: The Mailchimp Optin Cat WordPress Plugin Makes It Super Simple To Create Beautiful Mailchimp Sign-up Widgets & Forms In Minutes. 6 6 Author: Fatcat Apps 7 Version: 2. 3.07 Version: 2.4.0 8 8 Author URI: https://fatcatapps.com/ 9 9 */ … … 19 19 define( 'FCA_EOI_PLUGIN_SLUG', 'mailchimp-wp' ); 20 20 define( 'FCA_EOI_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); 21 define( 'FCA_EOI_VER', '2. 3.0' );21 define( 'FCA_EOI_VER', '2.4.0' ); 22 22 23 23 if( ! defined ( 'FCA_EOI_DEBUG' ) ) { … … 48 48 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-shortcode.php'; 49 49 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-widget.php'; 50 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-pointer.php';51 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-tour-pointer.php';52 50 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-activity.php'; 53 51 require_once FCA_EOI_PLUGIN_DIR . 'includes/eoi-functions.php'; … … 98 96 // Load subscribing banner for free users 99 97 if( $this->distro == 'free' ) { 100 $pointer = new EasyOptInsPointer( $this->settings );101 98 //load EasyOptIns Upgrade notifications 102 99 require plugin_dir_path( __FILE__ ) . 'includes/eoi-upgrade.php'; -
mailchimp-wp/trunk/providers/mailchimp/functions.php
r1991436 r2044994 183 183 184 184 $status = 'pending'; 185 if ( mailchimp_is_user( $settings, $user_data, $list_id ) OR !$double_opt_in) {185 if ( mailchimp_is_user( $settings, $user_data, $list_id ) OR ( $double_opt_in != 'true' ) ) { 186 186 $status = 'subscribed'; 187 187 } -
mailchimp-wp/trunk/readme.txt
r1991436 r2044994 4 4 Donate link: https://fatcatapps.com/optincat?utm_campaign=descriptioncta&utm_source=httpswordpress.orgpluginsmailchimp-wp&utm_medium=referral 5 5 Requires at least: 3.9.1 6 Tested up to: 5. 0.07 Stable tag: 2. 3.06 Tested up to: 5.1.0 7 Stable tag: 2.4.0 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 284 284 == Changelog == 285 285 286 287 = 2.4.0 = 288 * Fix MailChimp single optin setting not working 289 * Remove unused onboarding code 290 * Tested up to WordPress 5.1.0 286 291 287 292 = 2.3.0 =
Note: See TracChangeset
for help on using the changeset viewer.