Merge pull request #267 from RRZE-Webteam/dev

v1.25.4

Author: cassandre

includes/Table/Table.php

@@ -12,15 +12,18 @@
 class Table {
 
     public function __construct() {
-        add_shortcode('tablescript', [$this, 'shortcodeTablescript']);
         add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
+        add_filter( 'the_content', [$this, 'includeTablescript'] );
     }
 
-    public function shortcodeTablescript($atts, $content = '', $tag = '') {
-        wp_enqueue_script('rrze-tables');
-        $script = 'jQuery(function($) { $("table.sorttable").tablesorter(); $("table.filtertable").tablesorter({widgets: ["filter"], filter_columnAnyMatch: true, }); }); ';
-        wp_add_inline_script('rrze-tables', $script, 'after' );
-        wp_enqueue_style('rrze-elements');
+    public function includeTablescript($content) {
+        if (strpos($content, '<table ') !== false) {
+            wp_enqueue_script('rrze-tables');
+            $script = 'jQuery(function($) { $("table.sorttable").tablesorter(); $("table.filtertable").tablesorter({widgets: ["filter"], filter_columnAnyMatch: true, }); }); ';
+            wp_add_inline_script('rrze-tables', $script, 'after' );
+            wp_enqueue_style('rrze-elements');
+        }
+        return $content;
     }
 
     public static function enqueueScripts() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrze-elements",
-  "version": "1.25.3",
+  "version": "1.25.4",
   "description": "RRZE Elements: Gestalterische Erweiterungen für Webauftritte.",
   "main": "rrze-elements.php",
   "textdomain": "rrze-elements",

rrze-elements.php

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Elements
 Plugin URI:      https://github.com/RRZE-Webteam/rrze-elements
 Description:     Advanced design elements for WordPress websites.
-Version:         1.25.3
+Version:         1.25.4
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License v2
@@ -23,7 +23,7 @@
 
 const RRZE_PHP_VERSION = '7.4';
 const RRZE_WP_VERSION = '5.9';
-const RRZE_ELEMENTS_VERSION = '1.25.3';
+const RRZE_ELEMENTS_VERSION = '1.25.4';
 
 spl_autoload_register(function ($class) {
     $prefix = __NAMESPACE__;