From 95115571721d40cd5e43d11aa6e7c754929b2d40 Mon Sep 17 00:00:00 2001 From: pewgeuges <73141620+pewgeuges@users.noreply.github.com> Date: Thu, 10 Dec 2020 04:09:17 +0000 Subject: [PATCH] bugfix release 2.1.6 fixing priority conflict, URL wrap bug and tooltip z-index bug, in response to Forum git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2436137 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/dashboard/subpage-main.php | 6 ++---- class/settings.php | 25 +++++++++++++++++++------ class/task.php | 6 +++--- css/public.css | 4 ++-- css/settings.css | 4 ++-- footnotes.php | 4 ++-- readme.txt | 15 ++++++++------- templates/dashboard/settings-other.html | 8 +++----- 8 files changed, 41 insertions(+), 31 deletions(-) diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php index a2414bc..28d49b1 100644 --- a/class/dashboard/subpage-main.php +++ b/class/dashboard/subpage-main.php @@ -13,8 +13,9 @@ * 2.1.4 settings for ref container, tooltips and scrolling 2020-12-03T0950+0100 * 2.2.0 slight UI reordering 2020-12-09T1114+0100 * 2.2.0 option to disable URL line wrapping 2020-12-09T1604+0100 + * 2.2.0 remove expert mode setting as irrelevant 2020-12-09T2105+0100 * - * Last modified: 2020-12-09T1716+0100 + * Last modified: 2020-12-09T2105+0100 */ /** @@ -367,9 +368,6 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { "notice1-excerpt" => __("This should be disabled.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "notice2-excerpt" => __("In some themes, the Advanced Excerpt plugin is indispensable to display footnotes in excerpts.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "notice3-excerpt" => __("Footnotes cannot be disabled in excerpts. A workaround is to avoid footnotes in the first 55 words.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - - "label-expert-mode" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE, __("Enable the Expert mode:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), - "expert-mode" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE, $l_arr_Enabled) ) ); // display template with replaced placeholders diff --git a/class/settings.php b/class/settings.php index 4494f8e..601a8e7 100644 --- a/class/settings.php +++ b/class/settings.php @@ -18,9 +18,10 @@ * 2.1.1 fix ref container by option to switch index/symbol 2020-11-16T2022+0100 * 2.1.3 fix ref container positioning by priority level 2020-11-17T0205+0100 * 2.1.4 more settings container keys 2020-12-03T0955+0100 - * 2.2.0 option to disable URL line wrapping 2020-12-09T1606+0100 + * 2.1.6 option to disable URL line wrapping 2020-12-09T1606+0100 + * 2.1.6 set default priority level of the_content to 98 2020-12-10T0447+0100 * - * Last modified: 2020-12-09T1606+0100 + * Last modified: 2020-12-10T0447+0100 */ @@ -144,6 +145,8 @@ class MCI_Footnotes_Settings { * @author Stefan Herndler * @since 1.5.5 * @var string + * + * @since 2.1.6: this setting removed as irrelevant since priority level setting is permanently visible 2020-12-09T2107+0100 */ const C_BOOL_FOOTNOTES_EXPERT_MODE = "footnote_inputfield_enable_expert_mode"; @@ -463,11 +466,15 @@ class MCI_Footnotes_Settings { /** * Settings Container Key for URL wrap option + * + * This is made optional because it may cause issues when the regex catches too much; + * alongside the regex now contains a catch-all negative lookbehind excluding every URL + * preceded by '\w=.' * - * @since 2.2.0 + * @since 2.1.6 * @var bool * - * 2020-12-09T1554+0100 + * 2020-12-09T1554+0100..2020-12-10T0446+0100 */ const C_BOOL_FOOTNOTE_URL_WRAP_ENABLED = "footnote_inputfield_url_wrap_enabled"; @@ -665,8 +672,14 @@ class MCI_Footnotes_Settings { // empty should be interpreted as PHP_INT_MAX, but a numbox cannot be set to empty: // // define -1 as PHP_INT_MAX instead - self::C_INT_EXPERT_LOOKUP_THE_TITLE_PRIORITY_LEVEL => PHP_INT_MAX, - self::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL => 1000, + self::C_INT_EXPERT_LOOKUP_THE_TITLE_PRIORITY_LEVEL => PHP_INT_MAX, + + // Priority level of the_content as the only relevant one + // must be less than 99 because that is the level of Super Socializer, + // and the Pinterest button code contains at least one instance of '((' + // and one of '))', i.e. the default footnote start and end short codes, + // causing an issue with two fake footnotes messing up the whole website. + self::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL => 98, self::C_INT_EXPERT_LOOKUP_THE_EXCERPT_PRIORITY_LEVEL => PHP_INT_MAX, self::C_INT_EXPERT_LOOKUP_WIDGET_TITLE_PRIORITY_LEVEL => PHP_INT_MAX, self::C_INT_EXPERT_LOOKUP_WIDGET_TEXT_PRIORITY_LEVEL => PHP_INT_MAX, diff --git a/class/task.php b/class/task.php index c7212a4..f2affc8 100644 --- a/class/task.php +++ b/class/task.php @@ -25,10 +25,10 @@ * 2.1.4 ref container column width and tooltip font size settings 2020-12-03T0954+0100 * 2.1.4 scroll offset and duration settings 2020-12-05T0538+0100 * 2.1.4 tooltip display duration settings 2020-12-06T1320+0100 - * 2.2.0 option to disable URL line wrapping 2020-12-09T1606+0100 - * 2.2.0 add catch-all exclusion to fix URL line wrapping 2020-12-09T1921+0100 + * 2.1.6 option to disable URL line wrapping 2020-12-09T1606+0100 + * 2.1.6 add catch-all exclusion to fix URL line wrapping 2020-12-09T1921+0100 * - * Last modified: 2020-12-09T1921+0100 + * Last modified: 2020-12-10T0448+0100 */ // If called directly, abort: diff --git a/css/public.css b/css/public.css index 10d8614..3b9db84 100755 --- a/css/public.css +++ b/css/public.css @@ -5,9 +5,9 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.2.0d5 + * Version: 2.1.6 * - * Last modified: 2020-12-09T1924+0100 + * Last modified: 2020-12-10T0449+0100 */ diff --git a/css/settings.css b/css/settings.css index 0b4c0ef..86e6564 100755 --- a/css/settings.css +++ b/css/settings.css @@ -5,9 +5,9 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.2.0d5 + * Version: 2.1.6 * - * Last modified: 2020-12-09T1924+0100 + * Last modified: 2020-12-10T0449+0100 */ diff --git a/footnotes.php b/footnotes.php index ce99dfa..ebbee88 100755 --- a/footnotes.php +++ b/footnotes.php @@ -4,12 +4,12 @@ Plugin URI: https://wordpress.org/plugins/footnotes/ Description: time to bring footnotes to your website! footnotes are known from offline publishing and everybody takes them for granted when reading a magazine. Author: Mark Cheret - Version: 2.2.0d5 + Version: 2.1.6 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages */ -define( 'FOOTNOTES_VERSION', '2.2.0d5' ); +define( 'FOOTNOTES_VERSION', '2.1.6' ); /* Copyright 2020 Mark Cheret (email: mark@cheret.de) diff --git a/readme.txt b/readme.txt index e07741e..8e8e73b 100755 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: footnote, footnotes, bibliography, formatting, notes, Post, posts, referen Requires at least: 3.9 Tested up to: 5.5 Requires PHP: 5.6 -Stable Tag: 2.1.5 +Stable Tag: 2.1.6 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -80,12 +80,13 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == -= 2.2.0d5 = -- Bugfix: Reference container, tooltips: fix issues with URL wrap span by catch-all lookbehind -- Bugfix: Tooltips: set z-index to maximum to address display issues with overlay content -- Bugfix: Dashboard: fix settings bug by canceling new tab for CSS -- Bugfix: add option to disable URL line wrapping added for Unicode non conformant browsers -- Update: Dashboard: reorder tabs, move CSS to extra tab, update tab labels += 2.1.6 = +- Bugfix: Priority levels: set the_content priority level to 98 to prevent plugin conflict +- Bugfix: Tooltips: set z-index to maximum 2147483647 to address display issues with overlay content +- Bugfix: Reference container, tooltips: fix issues with URL wrap span by catch-all negative lookbehind +- Bugfix: Reference container, tooltips: add option to disable URL line wrapping added for browser support +- Update: Dashboard: reorder tabs and update tab labels +- Bugfix: Dashboard: remove Expert mode enable setting since permanently enabled as 'Priority' - Bugfix: Dashboard: fix punctuation-related localization issue by including colon in labels - Bugfix: Localization: conform to WordPress plugin language file name scheme diff --git a/templates/dashboard/settings-other.html b/templates/dashboard/settings-other.html index 38bc7f2..582105b 100644 --- a/templates/dashboard/settings-other.html +++ b/templates/dashboard/settings-other.html @@ -11,11 +11,9 @@ [[label-excerpt]] [[excerpt]] [[notice1-excerpt]] - [[notice2-excerpt]]
[[notice3-excerpt]] - - - [[label-expert-mode]] - [[expert-mode]] +
+

[[notice2-excerpt]] [[notice3-excerpt]]

+