From ddb568805bbbecaefaaa532e4d24e9840c0be6a5 Mon Sep 17 00:00:00 2001 From: pewgeuges <73141620+pewgeuges@users.noreply.github.com> Date: Mon, 2 Nov 2020 20:10:18 +0000 Subject: [PATCH] Preparing bugfix release 2.0.5 everything complete git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2411425 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/init.php | 35 +++++++++++++++++++++-------------- class/settings.php | 8 +++++--- class/task.php | 28 +++++++++++++++++++--------- css/public.css | 9 +++++++-- footnotes.php | 34 +++++++++++++++++----------------- readme.txt | 9 ++++++++- 6 files changed, 77 insertions(+), 46 deletions(-) diff --git a/class/init.php b/class/init.php index 1fcf579..e4bc45a 100644 --- a/class/init.php +++ b/class/init.php @@ -10,8 +10,9 @@ * * Edited for v2.0.0: Added jQueryUI from CDN 2020-10-26T1907+0100 * Edited for v2.0.3: Added style sheet versioning 2020-10-29T1413+0100 - * Edited for v2.0.4: Enqueuing settings.css 2020-11-01T0317+0100 * Edited for v2.0.4: Added jQuery UI from WordPress 2020-11-01T1902+0100 + * + * Last modified: 2020-11-02T2003+0100 */ @@ -64,6 +65,14 @@ class MCI_Footnotes { * * @author Stefan Herndler * @since 1.5.0 + * + * Edited for 1.6.5: replaced deprecated function create_function() + * + * Contributed by Felipe Lavín Z. Thankfully acknowledged. + * + * Deprecated in PHP 7.2 + * See + * See also: */ public function initializeWidgets() { register_widget("MCI_Footnotes_Widget_ReferenceContainer"); @@ -97,28 +106,26 @@ class MCI_Footnotes { * @since 1.5.0 * * Updated for v2.0.4 by adding jQueryUI from WordPress following @check2020de: - * + * * See * * jQueryUI re-enables the tooltip infobox disabled when WPv5.5 was released. */ public function registerPublic() { - - // add the jQuery plugin (already registered by WordPress) - wp_enqueue_script('jquery'); - - // Add jQueryUI: 'no need to enqueue -core, because dependancies are set' - wp_enqueue_script( 'jquery-ui-widget' ); - wp_enqueue_script( 'jquery-ui-mouse' ); - wp_enqueue_script( 'jquery-ui-accordion' ); - wp_enqueue_script( 'jquery-ui-autocomplete' ); - wp_enqueue_script( 'jquery-ui-slider' ); + + // add the jQuery plugin (already registered by WordPress) + wp_enqueue_script( 'jquery' ); + // Add jQueryUI: 'no need to enqueue -core, because dependencies are set' + wp_enqueue_script( 'jquery-ui-widget' ); + wp_enqueue_script( 'jquery-ui-mouse' ); + wp_enqueue_script( 'jquery-ui-accordion' ); + wp_enqueue_script( 'jquery-ui-autocomplete' ); + wp_enqueue_script( 'jquery-ui-slider' ); // Add jQuery tools: wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__)); // IMPORTANT: up-to-date plugin version number for cache busting. - wp_enqueue_style('mci-footnotes-css-public', plugins_url('../css/public.css', __FILE__), '', '2.0.4'); - wp_enqueue_style('mci-footnotes-css-settings', plugins_url('../css/settings.css', __FILE__), '', '2.0.4'); + wp_enqueue_style('mci-footnotes-css-public', plugins_url('../css/public.css', __FILE__), '', '2.0.5'); } } diff --git a/class/settings.php b/class/settings.php index 5305237..03b8af4 100644 --- a/class/settings.php +++ b/class/settings.php @@ -407,13 +407,15 @@ class MCI_Footnotes_Settings { self::C_STR_HYPERLINK_ARROW_USER_DEFINED => '', self::C_STR_CUSTOM_CSS => '' ), + // These should all be enabled by default. + // See "footnotes_storage_expert" => array( - self::C_BOOL_EXPERT_LOOKUP_THE_TITLE => '', + self::C_BOOL_EXPERT_LOOKUP_THE_TITLE => 'yes', self::C_BOOL_EXPERT_LOOKUP_THE_CONTENT => 'yes', self::C_BOOL_EXPERT_LOOKUP_THE_EXCERPT => 'yes', - self::C_BOOL_EXPERT_LOOKUP_WIDGET_TITLE => '', + self::C_BOOL_EXPERT_LOOKUP_WIDGET_TITLE => 'yes', self::C_BOOL_EXPERT_LOOKUP_WIDGET_TEXT => 'yes', - self::C_BOOL_EXPERT_LOOKUP_THE_POST => '' + self::C_BOOL_EXPERT_LOOKUP_THE_POST => 'yes' ) ); diff --git a/class/task.php b/class/task.php index c8aa494..c91bff1 100644 --- a/class/task.php +++ b/class/task.php @@ -7,7 +7,8 @@ * @since 1.5.0 * * Edited for v2.0.0 and following. - * Last modified 2020-11-01T1945+0100 + * + * Last modified 2020-11-02T1147+0100 */ // If called directly, abort: @@ -53,31 +54,40 @@ class MCI_Footnotes_Task { * * @author Stefan Herndler * @since 1.5.0 + * + * Edited for v2.0.5 2020-11-02T0330+0100 + * + * Explicitly set all priority to default "10" instead of lowest "PHP_INT_MAX", + * especially for the_content, or footnotes won’t display beneath the content but + * below other features added by other plugins. + * Although the default, 10 seems to suffice. + * Requested by users: + * Documentation: */ public function registerHooks() { // append custom css to the header - add_filter('wp_head', array($this, "wp_head"), PHP_INT_MAX); + add_filter('wp_head', array($this, "wp_head"), 10); // append the love and share me slug to the footer - add_filter('wp_footer', array($this, "wp_footer"), PHP_INT_MAX); + add_filter('wp_footer', array($this, "wp_footer"), 10); if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_TITLE))) { - add_filter('the_title', array($this, "the_title"), PHP_INT_MAX); + add_filter('the_title', array($this, "the_title"), 10); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_CONTENT))) { - add_filter('the_content', array($this, "the_content"), PHP_INT_MAX); + add_filter('the_content', array($this, "the_content"), 10); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_EXCERPT))) { - add_filter('the_excerpt', array($this, "the_excerpt"), PHP_INT_MAX); + add_filter('the_excerpt', array($this, "the_excerpt"), 10); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_WIDGET_TITLE))) { - add_filter('widget_title', array($this, "widget_title"), PHP_INT_MAX); + add_filter('widget_title', array($this, "widget_title"), 10); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_WIDGET_TEXT))) { - add_filter('widget_text', array($this, "widget_text"), PHP_INT_MAX); + add_filter('widget_text', array($this, "widget_text"), 10); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_POST))) { - add_filter('the_post', array($this, "the_post"), PHP_INT_MAX); + add_filter('the_post', array($this, "the_post"), 10); } // reset stored footnotes when displaying the header self::$a_arr_Footnotes = array(); diff --git a/css/public.css b/css/public.css index 427f06d..6bd9d97 100755 --- a/css/public.css +++ b/css/public.css @@ -4,8 +4,9 @@ * Created-Date: 15.05.14 * Created-Time: 16:21 * Since: 1.0 - * Version: 2.0.4 - * Last modified: 2020-11-01T0536+0100 + * Version: 2.0.5 + * + * Last modified: 2020-11-02T2050+0100 */ @@ -63,6 +64,7 @@ span.footnote_tooltip { font-style: italic; color: green; text-decoration: none !important; + cursor: pointer; } .continue:hover { color: blue; @@ -148,6 +150,9 @@ span.footnote_tooltip { max-width: 100px; } } +.footnote_plugin_text { + width: unset; /*unset width of text column to fix site issues*/ +} /* Footnotes printing style rules * diff --git a/footnotes.php b/footnotes.php index d527fa8..4353864 100755 --- a/footnotes.php +++ b/footnotes.php @@ -1,29 +1,29 @@