for Bugfix release 2.0.6 rolling back priority fix

git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2412164 b8457f37-d9ea-0310-8a92-e5e31aec5664

class/init.php

@@ -12,7 +12,7 @@
  * Edited for v2.0.3: Added style sheet versioning   2020-10-29T1413+0100
  * Edited for v2.0.4: Added jQuery UI from WordPress   2020-11-01T1902+0100
  * 
- * Last modified:   2020-11-02T2003+0100
+ * Last modified:   2020-11-03T1622+0100
  */
 
 
@@ -126,6 +126,6 @@ class MCI_Footnotes {
         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.5');
+        wp_enqueue_style('mci-footnotes-css-public',   plugins_url('../css/public.css',   __FILE__), '', '2.0.6');
     }
 }

class/settings.php

@@ -6,7 +6,7 @@
  * @author Stefan Herndler
  * @since 1.5.0 14.09.14 10:43
  * 
- * Edited for v2.0.4   2020-11-01T0333+0100
+ * Edited for v2.0.4   2020-11-02T2115+0100
  */
 
 

class/task.php

@@ -8,7 +8,7 @@
  * 
  * Edited for v2.0.0 and following.
  * 
- * Last modified   2020-11-02T1147+0100
+ * Last modified   2020-11-04T0505+0100
  */
 
 // If called directly, abort:
@@ -56,38 +56,44 @@ class MCI_Footnotes_Task {
      * @since 1.5.0
 	 * 
 	 * Edited for v2.0.5   2020-11-02T0330+0100
+	 * Edited for v2.0.6   2020-11-04T0504+0100
 	 * 
-	 * Explicitly set all priority to default "10" instead of lowest "PHP_INT_MAX", 
+	 * Explicitly setting all priority to default "10" instead of lowest "PHP_INT_MAX", 
-	 * especially for the_content, or footnotes won’t display beneath the content but 
+	 * especially for the_content, makes the footnotes reference container display
-	 * below other features added by other plugins.
+	 * beneath the content and above other features added by other plugins.
 	 * Although the default, 10 seems to suffice.
 	 * Requested by users: <https://wordpress.org/support/topic/change-the-position-5/>
 	 * Documentation: <https://codex.wordpress.org/Plugin_API/#Hook_in_your_Filter>
+	 * 
+	 * Still need to assess priority levels, see bug reported in:
+	 * <https://wordpress.org/support/topic/change-the-position-5/#post-13612697>
+	 * 
+	 * Rolled back in v2.0.6.
      */
     public function registerHooks() {
         // append custom css to the header
-        add_filter('wp_head', array($this, "wp_head"), 10);
+        add_filter('wp_head', array($this, "wp_head"),PHP_INT_MAX);
 
         // append the love and share me slug to the footer
-        add_filter('wp_footer', array($this, "wp_footer"), 10);
+        add_filter('wp_footer', array($this, "wp_footer"),PHP_INT_MAX);
 
         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"), 10);
+            add_filter('the_title', array($this, "the_title"),PHP_INT_MAX);
         }
         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"), 10);
+            add_filter('the_content', array($this, "the_content"),PHP_INT_MAX);
         }
         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"), 10);
+             add_filter('the_excerpt', array($this, "the_excerpt"),PHP_INT_MAX);
         }
         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"), 10);
+            add_filter('widget_title', array($this, "widget_title"),PHP_INT_MAX);
         }
         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"), 10);
+            add_filter('widget_text', array($this, "widget_text"),PHP_INT_MAX);
         }
         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"), 10);
+            add_filter('the_post', array($this, "the_post"),PHP_INT_MAX);
         }
         // reset stored footnotes when displaying the header
         self::$a_arr_Footnotes = array();
@@ -443,6 +449,11 @@ class MCI_Footnotes_Task {
      * @author Stefan Herndler
      * @since 1.5.0
      * @return string
+	 * 
+	 * Edited for v2.0.6: appended post ID to support autoload / infinite scroll.
+	 * Requested by @docteurfitness: <https://wordpress.org/support/topic/auto-load-post-compatibility-update/>
+	 * Related request: <https://wordpress.org/support/topic/infinite-scroll-does-not-work-anymore-in-wp-5-5/>
+	 * 2020-11-04T0358+0100
      */
     public function ReferenceContainer() {
         // no footnotes has been replaced on this page
@@ -512,7 +523,7 @@ class MCI_Footnotes_Task {
             array(
                 "label" => MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_NAME),
                 "button-style" => !MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE)) ? 'display: none;' : '',
-                "id" => "footnote_references_container",
+                "id" => "footnote_references_container_" . get_the_id(),
                 "style" =>  MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE)) ? 'display: none;' : '',
                 "content" => $l_str_Body
             )

css/public.css

@@ -4,9 +4,9 @@
  * Created-Date: 15.05.14
  * Created-Time: 16:21
  * Since: 1.0
- * Version: 2.0.5
+ * Version: 2.0.6
  *
- * Last modified: 2020-11-02T2050+0100
+ * Last modified: 2020-11-04T0437+0100
  */
  
  
@@ -38,9 +38,6 @@
  */
 
 .footnote_plugin_tooltip_text {
-    vertical-align: top !important;
-    position: relative !important;
-    top: 0.6em !important;
     cursor: pointer;
     z-index: 1;
 }
@@ -74,11 +71,6 @@ span.footnote_tooltip {
 /* Footnotes reference container
  */
 
-.footnote-reference-container {
-    width: 100%;
-    border: none;
-}
-
 /* label */
 .footnote_container_prepare {
     display: block !important;
@@ -118,19 +110,29 @@ span.footnote_tooltip {
     color: #008800;
 }
 
-/* footnotes */
+/* Table starts here */
+.footnote-reference-container {
+    width: 100%;
+    border: none;
+}
+
+/* footnotes
+ * class footnote_plugin_link is for backcompat.
+ * Used in reference-container-body.html
+ * See <https://wordpress.org/support/topic/change-the-position-5/#post-13617988>
+.footnote_plugin_link,  */
 .footnote_plugin_index,
 .footnote_plugin_text {
     border:none !important;
-    text-align: left;
+    text-align: left !important;
-    vertical-align: top;
+    vertical-align: top !important;
-    padding: 10px 3px 5px 0;
+    padding: 10px 5px 5px 0 !important;
 }
 .footnote_plugin_index a,
 .footnote_plugin_text a {
-    text-decoration: none;
+    text-decoration: none !important;
 }
-.footnote_plugin_index a:hover,
+.footnote_plugin_index:hover,
 .footnote_plugin_text a:hover {
     text-decoration: underline !important;
 }
@@ -141,41 +143,34 @@ span.footnote_tooltip {
     word-wrap: normal !important;
     word-break: unset;
     word-break: keep-all !important;
-    white-space: nowrap;
     max-width: 140px;
+    width: 1px;          /*auto-extending column to fit widest*/
+    white-space: nowrap;
     overflow: hidden;
 }
-@media only screen and (max-width: 768px) {
-    .footnote_plugin_index {
-        max-width: 100px;
-    }
-}
 .footnote_plugin_text {
     width: unset;        /*unset width of text column to fix site issues*/
 }
 
+/* Responsive*/
+@media only screen and (max-width: 768px) {
+    .footnote_plugin_index {
+        max-width: 100px;
+    }
+}
+
 /* Footnotes printing style rules
  *
  * Printing a table, browsers tend to avoid page breaks,
- * but it takes a wrapper to avoid a page break before the table
+ * but it takes a wrapper to avoid a page break before the table.
+ *
+ * UI elements (button, arrows) and link styling are removed.
  */
 
 .footnote_container_overall_wrapper {
     page-break-inside: avoid;
 }
-.footnote_container_prepare {
+
-    page-break-after: avoid;
-}
-table.footnote_reference_container td {
-    display: block;
-}
-table.footnote_reference_container {
-    page-break-before: avoid;
-    page-break-inside: auto;
-}
-table.footnote_reference_container tr {
-    page-break-before: auto;
-}
 @media print {
     .footnote_tooltip,
     .footnote_reference_container_collapse_button_outfit,
@@ -189,7 +184,7 @@ table.footnote_reference_container tr {
         color: inherit;
         text-decoration: none !important;
     }
-    div.post-meta-edit-link-wrapper { /*hides the Edit button in WP2020*/
+    div.post-meta-edit-link-wrapper { /* Edit button in WP2020*/
         display: none;  /*(added as a service)*/
     }
 }

footnotes.php

@@ -4,7 +4,7 @@
     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.0.5
+    Version: 2.0.6
     Author URI: http://cheret.de/plugins/footnotes-2/
     Text Domain: footnotes
     Domain Path: /languages

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.0.5
+Stable Tag: 2.0.6
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -80,7 +80,15 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
 
 == Changelog ==
 
+= 2.0.6 =
+- Bugfix: Rolled back priority fix at the expense of reference container position
+- Bugfix: Support for infinite scroll / autoload
+- Bugfix: Public style sheet: Footnote referrers: deleted vertical align tweaks for cross-theme and user agent compatibility
+- Bugfix: Public style sheet: Reference container: auto-extending column to fit widest, to fix display with short note texts
+- Bugfix: Public style sheet: Reference container: IDs: slightly increased left padding
+
 = 2.0.5 =
+- Bugfix: Layout: Fixed reference container position through priority level (10)
 - Bugfix: Input boxes on public pages
 - Bugfix: Get references container close to content, not below all other features
 - Bugfix: Public style sheet: Reference container: unset width of text column to fix site issues

templates/public/footnote.html

@@ -1,2 +1,13 @@
-<a><sup id="footnote_plugin_tooltip_[[id]]" class="footnote_plugin_tooltip_text" onclick="footnote_moveToAnchor('footnote_plugin_reference_[[id]]');">[[before]][[index]][[after]]</sup></a>
+<a
-<span class="footnote_tooltip" id="footnote_plugin_tooltip_text_[[id]]">[[text]]</span>
+    ><sup
+        id="footnote_plugin_tooltip_[[id]]"
+        class="footnote_plugin_tooltip_text"
+        onclick="footnote_moveToAnchor('footnote_plugin_reference_[[id]]');"
+        >[[before]][[index]][[after]]</sup
+    ></a
+>
+<span
+    class="footnote_tooltip"
+    id="footnote_plugin_tooltip_text_[[id]]"
+    >[[text]]</span
+>

templates/public/reference-container-body.html

@@ -1,4 +1,15 @@
 <tr>
-	<td class="footnote_plugin_index" id="footnote_plugin_reference_[[id]]" onclick="footnote_moveToAnchor('footnote_plugin_tooltip_[[id]]');"><a><span class="footnote_plugin_index_arrow">[[arrow]]&#x200A;</span>[[index]].</a></td>
+    <td
-	<td class="footnote_plugin_text">[[text]]</td>
+        class="footnote_plugin_index footnote_plugin_link"
+        id="footnote_plugin_reference_[[id]]"
+        onclick="footnote_moveToAnchor('footnote_plugin_tooltip_[[id]]');"
+    ><a 
+    ><span 
+        class="footnote_plugin_index_arrow"
+    >[[arrow]]&#x200A;</span
+    >[[index]].</a
+    ></td>
+    <td 
+        class="footnote_plugin_text"
+    >[[text]]</td>
 </tr>

templates/public/tooltip.html

@@ -1 +1,13 @@
-<script type="text/javascript"> jQuery("#footnote_plugin_tooltip_[[id]]").tooltip({ tip: "#footnote_plugin_tooltip_text_[[id]]", tipClass: "footnote_tooltip", effect: "fade", predelay: 800, fadeInSpeed: 200, fadeOutSpeed: 2000, position: "[[position]]", relative: true, offset: [[[offset-y]], [[offset-x]]] }); </script> 
+<script type="text/javascript">
+    jQuery('#footnote_plugin_tooltip_[[id]]').tooltip({
+        tip: '#footnote_plugin_tooltip_text_[[id]]',
+        tipClass: 'footnote_tooltip',
+        effect: 'fade',
+        predelay: 800,
+        fadeInSpeed: 200,
+        fadeOutSpeed: 2000,
+        position: '[[position]]',
+        relative: true,
+        offset: [[[offset - y]], [[offset - x]]],
+    });
+</script>