diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 1a163335..d3d6d6ff 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -51d29bc6e2be833c15e189a133982f4e90f57ef2 +8bbe3332c9d5b5c51908814c1af6ccca9c597877 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 680caa72..08f33564 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -33,10 +33,10 @@ // Define as an AMD module if possible define( 'datatables', ['jquery'], factory ); } - else if ( typeof exports === 'object' ) { - // Node/CommonJS - module.exports = factory( require( 'jquery' ) ); - } + else if ( typeof exports === 'object' ) { + // Node/CommonJS + module.exports = factory( require( 'jquery' ) ); + } else if ( jQuery && !jQuery.fn.dataTable ) { // Define using browser globals otherwise // Prevent multiple instantiations if the script is loaded twice