Item14496: fixed html5 data attribs

foswiki · Sep 25, 2017 · dd7b0b9 · dd7b0b9
1 parent c64de85
commit dd7b0b9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/data/System/JQDataTablesPlugin.txt b/data/System/JQDataTablesPlugin.txt
@@ -193,6 +193,7 @@ Click on the table headers to sort the columns according to their data type.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Sep 2017: | fixed html5 data attributes |
 |  30 Aug 2017: | disabled =Author= auto-column; added =publishdate= and =publishauthor= auto-columns |
 |  23 Jan 2017: | don't report back an url parameter in the error message |
 |  02 Sep 2016: | added default english translation files |

diff --git a/lib/Foswiki/Plugins/JQDataTablesPlugin.pm b/lib/Foswiki/Plugins/JQDataTablesPlugin.pm
@@ -12,8 +12,8 @@ use Foswiki::Plugins::JQueryPlugin ();
 use Foswiki::Func ();
 use Foswiki::AccessControlException ();
 
-our $VERSION = '3.10';
-our $RELEASE = '30 Aug 2017';
+our $VERSION = '3.11';
+our $RELEASE = '25 Sep 2017';
 our $SHORTDESCRIPTION = 'JQuery based progressive enhancement of tables';
 
 sub initPlugin {
@@ -73,6 +73,7 @@ sub restConnector {
   eval "require $connectorClass";
   if ($@) {
     printRESTResult($response, 500, "ERROR: loading connector");
+    #print STDERR "ERROR loading connector $connectorClass: $@\n";
     return '';
   }
 

diff --git a/lib/Foswiki/Plugins/JQDataTablesPlugin/DBCacheConnector.pm b/lib/Foswiki/Plugins/JQDataTablesPlugin/DBCacheConnector.pm
@@ -156,7 +156,6 @@ sub buildQuery {
       } else {
         push(@includeFilter, "lc($propertyName)" . ($regexFlag ? "=~" : "~") . "lc('$part')");
       }
-
     }
 
     push @query, "(" . join(" AND ", @includeFilter) . ")"
@@ -192,7 +191,7 @@ sub search {
 
   my $sort = $this->column2Property($params{sort});
   my $hits = $db->dbQuery($params{query}, undef, $sort, $params{reverse});
-  return (0, 0, ()) unless $hits;
+  return (0, 0, []) unless $hits;
 
   my $total = scalar($db->getKeys());
   my $totalFiltered = $hits->count;

diff --git a/lib/Foswiki/Plugins/JQDataTablesPlugin/DataTables.pm b/lib/Foswiki/Plugins/JQDataTablesPlugin/DataTables.pm
@@ -319,7 +319,7 @@ sub handleDataTable {
   $html5Data = join(" ", @$html5Data);
   my $result = <<"HERE";
 <literal>
-<div class='jqDataTablesContainer' $html5Data' >
+<div class='jqDataTablesContainer' $html5Data>
 <table class='foswikiTable $theClass' $theWidth>
   <thead>$thead</thead>
   <tbody>