diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 31e0a88a..42ad9b62 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -de61014af48ec511ce3b384209f4d8c709f091a0 +f8977ef80e43dda4d2d8623f05e16b047d22478a diff --git a/media/js/dataTables.bootstrap.js b/media/js/dataTables.bootstrap.js index 26030d29..59ce5946 100644 --- a/media/js/dataTables.bootstrap.js +++ b/media/js/dataTables.bootstrap.js @@ -16,18 +16,21 @@ define( ['jquery', 'datatables'], factory ); } else if ( typeof exports === 'object' ) { - // Node / CommonJS - module.exports = function ($, dt) { + // CommonJS + module.exports = function ($) { if ( ! $ ) { $ = require('jquery'); } - factory( $, dt || $.fn.dataTable || require('datatables') ); + if ( ! $.fn.dataTable ) { require('datatables')($); } + + factory( $ ); }; } - else if ( jQuery ) { - // Browser standard - factory( jQuery, jQuery.fn.dataTable ); + else { + // Browser + factory( jQuery ); } -}(function( $, DataTable ) { +}(function( $ ) { 'use strict'; +var DataTable = $.fn.dataTable; /* Set the defaults for DataTables initialisation */ diff --git a/media/js/dataTables.bootstrap.min.js b/media/js/dataTables.bootstrap.min.js index 1d6623b5..fc125661 100644 --- a/media/js/dataTables.bootstrap.min.js +++ b/media/js/dataTables.bootstrap.min.js @@ -2,8 +2,8 @@ DataTables Bootstrap 3 integration ©2011-2015 SpryMedia Ltd - datatables.net/license */ -(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables"],b):"object"===typeof exports?module.exports=function(a,d){a||(a=require("jquery"));b(a,d||a.fn.dataTable||require("datatables"))}:jQuery&&b(jQuery,jQuery.fn.dataTable)})(function(b,a){b.extend(!0,a.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(a.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm", -sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(d,g,r,l,i,m){var n=new a.Api(d),s=d.oClasses,j=d.oLanguage.oPaginate,e,f,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k",{"class":s.sPageButton+" "+f,id:0===r&&"string"===typeof c?d.sTableId+"_"+c:null}).append(b("",{href:"#","aria-controls":d.sTableId,"data-dt-idx":o,tabindex:d.iTabIndex}).html(e)).appendTo(a),d.oApi._fnBindAction(p,{action:c}, +(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables"],b):"object"===typeof exports?module.exports=function(a){a||(a=require("jquery"));a.fn.dataTable||require("datatables")(a);b(a)}:b(jQuery)})(function(b){var a=b.fn.dataTable;b.extend(!0,a.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(a.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm", +sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(f,g,r,l,i,m){var n=new a.Api(f),s=f.oClasses,j=f.oLanguage.oPaginate,d,e,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k",{"class":s.sPageButton+" "+e,id:0===r&&"string"===typeof c?f.sTableId+"_"+c:null}).append(b("",{href:"#","aria-controls":f.sTableId,"data-dt-idx":o,tabindex:f.iTabIndex}).html(d)).appendTo(a),f.oApi._fnBindAction(p,{action:c}, l),o++)}},h;try{h=b(g).find(document.activeElement).data("dt-idx")}catch(t){}q(b(g).empty().html('