diff --git a/.eslintignore b/.eslintignore index eac2bbb..2b29f27 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1 @@ -js/scrollTo.js tests diff --git a/js/mailchimp.js b/js/mailchimp.js index 7d7c2c2..1170515 100644 --- a/js/mailchimp.js +++ b/js/mailchimp.js @@ -21,7 +21,10 @@ }); $('#mc_submit_type').val('js'); } - $.scrollTo('#mc_signup', { offset: { top: -28 } }); + window.scrollTo({ + top: document.getElementById('mc_signup').offsetTop - 28, + behavior: 'smooth', + }); } $(function ($) { diff --git a/js/scrollTo.js b/js/scrollTo.js deleted file mode 100755 index 5e78778..0000000 --- a/js/scrollTo.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * jQuery.ScrollTo - Easy element scrolling using jQuery. - * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com - * Dual licensed under MIT and GPL. - * Date: 5/25/2009 - * @author Ariel Flesler - * @version 1.4.2 - * - * http://flesler.blogspot.com/2007/10/jqueryscrollto.html - */ -;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery); \ No newline at end of file diff --git a/mailchimp.php b/mailchimp.php index 5e18821..3acd062 100644 --- a/mailchimp.php +++ b/mailchimp.php @@ -4,7 +4,7 @@ * Plugin URI: https://mailchimp.com/help/connect-or-disconnect-list-subscribe-for-wordpress/ * Description: Add a Mailchimp signup form widget to your WordPress site. * Version: 1.5.8 - * Requires at least: 2.8 + * Requires at least: 6.1 * Requires PHP: 7.0 * PHP tested up to: 8.3 * Author: Mailchimp @@ -105,7 +105,6 @@ function mailchimp_sf_load_resources() { // JS if ( get_option( 'mc_use_javascript' ) === 'on' ) { if ( ! is_admin() ) { - wp_enqueue_script( 'jquery_scrollto', MCSF_URL . 'js/scrollTo.js', array( 'jquery' ), MCSF_VER, true ); wp_enqueue_script( 'mailchimp_sf_main_js', MCSF_URL . 'js/mailchimp.js', array( 'jquery', 'jquery-form' ), MCSF_VER, true ); // some javascript to get ajax version submitting to the proper location global $wp_scripts; diff --git a/mailchimp_compat.php b/mailchimp_compat.php index ca27b53..c10331a 100644 --- a/mailchimp_compat.php +++ b/mailchimp_compat.php @@ -31,95 +31,9 @@ function mailchimp_sf_display_widget( $args = array() ) { } } - /* Shortcodes */ add_shortcode( 'mailchimpsf_widget', 'mailchimp_sf_shortcode' ); - -/* Functions for < WP 3.0 Compat */ - -if ( ! function_exists( 'home_url' ) ) { - /** - * Retrieve the home url for the current site. - * - * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is - * overridden. - * - * @package WordPress - * @since 3.0.0 - * - * @uses get_home_url() - * - * @param string $path (optional) Path relative to the home url. - * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https' - * @return string Home url link with optional path appended. - */ - function home_url( $path = '', $scheme = null ) { - return get_home_url( null, $path, $scheme ); - } -} - -if ( ! function_exists( 'get_home_url' ) ) { - /** - * Retrieve the home url for a given site. - * - * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is - * overridden. - * - * @package WordPress - * @since 3.0.0 - * - * @param int $blog_id (optional) Blog ID. Defaults to current blog. - * @param string $path (optional) Path relative to the home url. - * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https' - * @return string Home url link with optional path appended. - */ - function get_home_url( $blog_id = null, $path = '', $scheme = null ) { - $orig_scheme = $scheme; - - if ( ! in_array( $scheme, array( 'http', 'https' ), true ) ) { - $scheme = is_ssl() && ! is_admin() ? 'https' : 'http'; - } - - if ( empty( $blog_id ) || ! is_multisite() ) { - $home = get_option( 'home' ); - } else { - $home = get_blog_option( $blog_id, 'home' ); - } - - $url = str_replace( 'http://', "$scheme://", $home ); - - if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false ) { - $url .= '/' . ltrim( $path, '/' ); - } - - return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id ); - } -} - -if ( ! function_exists( 'is_multisite' ) ) { - /** - * Whether Multisite support is enabled - * - * @since 3.0.0 - * - * @return bool True if multisite is enabled, false otherwise. - */ - function is_multisite() { - if ( defined( 'MULTISITE' ) ) { - return MULTISITE; - } - - if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) ) { - return true; - } - - return false; - } -} - /** * Deprecates functions for plugin version 1.6.0 * diff --git a/readme.txt b/readme.txt index e680f1a..c03ae09 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ === Mailchimp List Subscribe Form === Contributors: Mailchimp Tags: mailchimp, email, newsletter, signup, marketing -Tested up to: 4.5 +Tested up to: 6.5 Stable tag: 1.5.8 License: GPL-2.0-or-later License URI: https://spdx.org/licenses/GPL-2.0-or-later.html