From 010e070ff013bdae75c330a0bf0a183417070211 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Mon, 19 Sep 2016 16:29:36 +0100 Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc --- .datatables-commit-sync | 2 +- media/js/dataTables.foundation.js | 2 +- media/js/dataTables.foundation.min.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index a3ea9c96..29b1e29f 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -8b20a35fca20da78210067e4696a4805a212d5ae +2adef50eecee4ca7200acd7ff7c9344b8d7e557f diff --git a/media/js/dataTables.foundation.js b/media/js/dataTables.foundation.js index 1e87c4b3..4d3bb45e 100644 --- a/media/js/dataTables.foundation.js +++ b/media/js/dataTables.foundation.js @@ -47,7 +47,7 @@ meta.remove(); $.extend( DataTable.ext.classes, { sWrapper: "dataTables_wrapper dt-foundation", - sProcessing: "dataTables_processing panel" + sProcessing: "dataTables_processing panel callout" } ); diff --git a/media/js/dataTables.foundation.min.js b/media/js/dataTables.foundation.min.js index 58c7b030..d47166b4 100644 --- a/media/js/dataTables.foundation.min.js +++ b/media/js/dataTables.foundation.min.js @@ -3,6 +3,6 @@ ©2011-2015 SpryMedia Ltd - datatables.net/license */ (function(d){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return d(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);if(!b||!b.fn.dataTable)b=require("datatables.net")(a,b).$;return d(b,a,a.document)}:d(jQuery,window,document)})(function(d){var a=d.fn.dataTable,b=d('').appendTo("head");a.ext.foundationVersion=b.css("font-family").match(/small|medium|large/)?6:5;b.remove();d.extend(a.ext.classes, -{sWrapper:"dataTables_wrapper dt-foundation",sProcessing:"dataTables_processing panel"});d.extend(!0,a.defaults,{dom:"<'row'<'small-6 columns'l><'small-6 columns'f>r>t<'row'<'small-6 columns'i><'small-6 columns'p>>",renderer:"foundation"});a.ext.renderer.pageButton.foundation=function(b,l,r,s,e,i){var m=new a.Api(b),t=b.oClasses,j=b.oLanguage.oPaginate,u=b.oLanguage.oAria.paginate||{},f,h,g,v=5===a.ext.foundationVersion,q=function(a,n){var k,o,p,c,l=function(a){a.preventDefault();!d(a.currentTarget).hasClass("unavailable")&& +{sWrapper:"dataTables_wrapper dt-foundation",sProcessing:"dataTables_processing panel callout"});d.extend(!0,a.defaults,{dom:"<'row'<'small-6 columns'l><'small-6 columns'f>r>t<'row'<'small-6 columns'i><'small-6 columns'p>>",renderer:"foundation"});a.ext.renderer.pageButton.foundation=function(b,l,r,s,e,i){var m=new a.Api(b),t=b.oClasses,j=b.oLanguage.oPaginate,u=b.oLanguage.oAria.paginate||{},f,h,g,v=5===a.ext.foundationVersion,q=function(a,n){var k,o,p,c,l=function(a){a.preventDefault();!d(a.currentTarget).hasClass("unavailable")&& m.page()!=a.data.action&&m.page(a.data.action).draw("page")};k=0;for(o=n.length;k",{"class":t.sPageButton+" "+h,"aria-controls":b.sTableId,"aria-label":u[c],tabindex:b.iTabIndex,id:0===r&&"string"===typeof c?b.sTableId+"_"+c:null}).append(g?d("<"+g+"/>",{href:"#"}).html(f):f).appendTo(a),b.oApi._fnBindAction(p,{action:c},l))}};q(d(l).empty().html('