development version 2.1.1d2 fix enqueuing in response to user

git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2416626 b8457f37-d9ea-0310-8a92-e5e31aec5664
2020-11-11 13:24:25 +00:00 · 2020-11-11 13:24:25 +00:00 · c05c96a6fd
parent 6c776388c9
commit c05c96a6fd
5 changed files with 40 additions and 40 deletions
--- a/class/init.php
+++ b/class/init.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Includes the main Class of the Plugin.
- * 
+ *
 * ******************************************************************************************************
 * IMPORTANT: In registerPublic() line 134: Please keep plugin version # up to date for cache busting.  *
 * ******************************************************************************************************
@ -9,12 +9,12 @@
 * @filesource
 * @author Stefan Herndler
 * @since 1.5.0 12.09.14 10:56
- * 
+ *
 * Edited for v1.6.5: Replaced deprecated function create_function()
 * Edited for v2.0.0: Added jQueryUI from Cloudflare   2020-10-26T1907+0100
 * 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
- * 
+ *
 * Continual update of version number.
 */

@ -49,12 +49,12 @@ class MCI_Footnotes {
        MCI_Footnotes_WYSIWYG::registerHooks();
        // register general hooks
        MCI_Footnotes_Hooks::registerHooks();
-        
+
        // initialize the Plugin Dashboard
        $this->initializeDashboard();
        // initialize the Plugin Task
        $this->initializeTask();
-        
+
        // Register all Public Stylesheets and Scripts
        add_action('init', array($this, 'registerPublic'));
        // Enqueue all Public Stylesheets and Scripts
@ -68,11 +68,11 @@ 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.
-     * 
+     *
     * create_function() was deprecated in PHP 7.2:
     * <https://wordpress.org/support/topic/deprecated-in-php-7-2-function-create_function-is-deprecated/>
     * See also: <https://wordpress.org/support/topic/deprecated-function-create_function-14/>
@ -107,55 +107,52 @@ class MCI_Footnotes {
     *
     * @author Stefan Herndler
     * @since 1.5.0
-     * 
+     *
     * Updated for v2.0.0 adding jQuery UI
     * Updated for v2.0.4 by adding jQuery UI from WordPress following @check2020de:
     * <https://wordpress.org/support/topic/gdpr-issue-with-jquery/>
     * See <https://wordpress.stackexchange.com/questions/273986/correct-way-to-enqueue-jquery-ui>
-     * 
+     *
     * jQueryUI re-enables the tooltip infobox disabled when WPv5.5 was released.
     */
    public function registerPublic() {

-        ###  SCRIPTS
+        //###  SCRIPTS

-        // add the jQuery plugin registered by WordPress
+        // enqueue the jQuery plugin registered by WordPress:
        wp_enqueue_script( 'jquery' );

-//        // Add jQuery Tools:
-//        wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__));
-//
-//        // Add the jQuery UI libraries registered by WordPress:
-//        // 'no need to enqueue -core, because dependencies are set'
-//        // Source: <https://wordpress.stackexchange.com/questions/273986/correct-way-to-enqueue-jquery-ui>
-//        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' );
+        // enqueue jQuery UI libraries registered by WordPress, needed for tooltips:
+        wp_enqueue_script( 'jquery-ui-core' );
+        wp_enqueue_script( 'jquery-ui-widget' );
+        wp_enqueue_script( 'jquery-ui-position' );
+        wp_enqueue_script( 'jquery-ui-tooltip' );
+
+        // enqueue jQuery Tools:
+        wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__));


-        // Should that not work, fetch jQuery UI from cdnjs.cloudflare.com:
-        // Add jQuery UI following @vonpiernik:
+        // Alternatively, fetch jQuery UI from cdnjs.cloudflare.com:
+        // Used to add jQuery UI following @vonpiernik:
        // <https://wordpress.org/support/topic/tooltip-hover-not-showing/#post-13456762>:
        // This was enabled in Footnotes v2.0.0 through v2.0.3.
        // Re-added for 2.0.9d1 / 2.1.1d0 to look whether it can fix a broken tooltip display.   2020-11-07T1601+0100/2020-11-08T2246+0100
-        wp_register_script( 'jQueryUI', 'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js', null, null, false ); // in header 2020-11-09T2003+0100
-        wp_enqueue_script( 'jQueryUI' );
-
+        //wp_register_script( 'jQueryUI', 'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js', null, null, false ); // in header 2020-11-09T2003+0100
+        //wp_enqueue_script( 'jQueryUI' );
+        // This is then needed instead of the above first instance:
        // Add jQuery Tools and finish adding jQueryUI:   2020-11-08T1638+0100/2020-11-08T2246+0100
-        wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__), ['jQueryUI']);
+        //wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__), ['jQueryUI']);

-        
-        ###  STYLES
-        
-        // IMPORTANT: up-to-date plugin version number NEEDED for cache busting:
+
+        //###  STYLES
+
+        // IMPORTANT: up-to-date plugin version number NEEDED FOR CACHE BUSTING:
        wp_enqueue_style(
            'mci-footnotes-css-public',
            plugins_url('../css/public.css', __FILE__),
            '',
-            '2.1.1d1'
+            '2.1.1d2'
        );
    }
-    
+
 }
--- a/css/public.css
+++ b/css/public.css
@ -4,9 +4,9 @@
 * Created-Date: 15.05.14
 * Created-Time: 16:21
 * Since: 1.0
- * Version: 2.1.1d1
+ * Version: 2.1.1d2
 *
- * Last modified: 2020-11-09T1948+0100
+ * Last modified: 2020-11-11T1402+0100
 */
 
 
--- a/css/settings.css
+++ b/css/settings.css
@ -4,9 +4,9 @@
 * Created-Date: 15.05.14
 * Created-Time: 16:21
 * Since: 1.0
- * Version: 2.1.0
+ * Version: 2.1.1d2
 *
- * Last modified: 2020-11-08T2150+0100
+ * Last modified: 2020-11-11T1402+0100
 */


--- a/footnotes.php
+++ b/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.1.1d1
+    Version: 2.1.1d2
    Author URI: http://cheret.de/plugins/footnotes-2/
    Text Domain: footnotes
    Domain Path: /languages
--- a/readme.txt
+++ b/readme.txt
@ -80,6 +80,9 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**

 == Changelog ==

+= 2.1.1d2 =
+- Bugfix: Libraries: jQuery UI: properly pick the libraries registered by WordPress needed for tooltips
+
 = 2.1.1d1 =
 - Bugfix: Libraries: jQuery UI: load in header not in footer in case it matters for fixing tooltips
 - Bugfix: Layout: Ref container: Footnote numbers: disabled bottom border for theme compatibility