From 28aa80521d17ec1838ac2052ec7d4bd550bf9e9d Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 2 Dec 2016 17:59:28 +0000 Subject: [PATCH] Fix: Bootstrap 4 flexbox grid Merge pull request #75 from stroebjo/master --- .datatables-commit-sync | 2 +- media/js/dataTables.bootstrap4.js | 6 +++--- media/js/dataTables.bootstrap4.min.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index e5c4ff96..4489b42d 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -6f70009306311f010e514295cdec687db3a0436e +6049a1ef47109ef5d4a940b2e4d567d032d91459 diff --git a/media/js/dataTables.bootstrap4.js b/media/js/dataTables.bootstrap4.js index e49d95f3..ecf5c16b 100644 --- a/media/js/dataTables.bootstrap4.js +++ b/media/js/dataTables.bootstrap4.js @@ -46,9 +46,9 @@ var DataTable = $.fn.dataTable; /* Set the defaults for DataTables initialisation */ $.extend( true, DataTable.defaults, { dom: - "<'row'<'col-md-6'l><'col-md-6'f>>" + - "<'row'<'col-md-12'tr>>" + - "<'row'<'col-md-5'i><'col-md-7'p>>", + "<'row'<'col-xs-12 col-md-6'l><'col-xs-12 col-md-6'f>>" + + "<'row'<'col-xs-12'tr>>" + + "<'row'<'col-xs-12 col-md-5'i><'col-xs-12 col-md-7'p>>", renderer: 'bootstrap' } ); diff --git a/media/js/dataTables.bootstrap4.min.js b/media/js/dataTables.bootstrap4.min.js index 471f174a..373af73e 100644 --- a/media/js/dataTables.bootstrap4.min.js +++ b/media/js/dataTables.bootstrap4.min.js @@ -2,7 +2,7 @@ DataTables Bootstrap 3 integration ©2011-2015 SpryMedia Ltd - datatables.net/license */ -(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,d){a||(a=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(a,d).$;return b(d,a,a.document)}:b(jQuery,window,document)})(function(b,a,d){var f=b.fn.dataTable;b.extend(!0,f.defaults,{dom:"<'row'<'col-md-6'l><'col-md-6'f>><'row'<'col-md-12'tr>><'row'<'col-md-5'i><'col-md-7'p>>",renderer:"bootstrap"});b.extend(f.ext.classes, -{sWrapper:"dataTables_wrapper form-inline dt-bootstrap4",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default",sPageButton:"paginate_button page-item"});f.ext.renderer.pageButton.bootstrap=function(a,h,r,m,j,n){var o=new f.Api(a),s=a.oClasses,k=a.oLanguage.oPaginate,t=a.oLanguage.oAria.paginate||{},e,g,p=0,q=function(d,f){var l,h,i,c,m=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&o.page()!=a.data.action&& -o.page(a.data.action).draw("page")};l=0;for(h=f.length;l",{"class":s.sPageButton+" "+g,id:0===r&&"string"===typeof c?a.sTableId+ -"_"+c:null}).append(b("",{href:"#","aria-controls":a.sTableId,"aria-label":t[c],"data-dt-idx":p,tabindex:a.iTabIndex,"class":"page-link"}).html(e)).appendTo(d),a.oApi._fnBindAction(i,{action:c},m),p++)}},i;try{i=b(h).find(d.activeElement).data("dt-idx")}catch(u){}q(b(h).empty().html('