From 94b2b2823b3284edf2ddda58b6fdb828b76103d4 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan@datatables.net>
Date: Tue, 1 Oct 2019 13:03:34 +0000
Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc

---
 .datatables-commit-sync          | 2 +-
 examples/styling/uikit.html      | 5 ++---
 media/js/dataTables.uikit.js     | 4 ++--
 media/js/dataTables.uikit.min.js | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index 474f979a..fbbac9ae 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-e4c2e02b8119648cd9527aa3a317192485c7109a
+e5288df24599b4116f8c91c4c3b78d807c8f5162
diff --git a/examples/styling/uikit.html b/examples/styling/uikit.html
index ba589914..eb01ee9d 100644
--- a/examples/styling/uikit.html
+++ b/examples/styling/uikit.html
@@ -5,7 +5,7 @@
 	<link rel="shortcut icon" type="image/ico" href="http://www.datatables.net/favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, user-scalable=no">
 	<title>DataTables example - UIKit 3 (Tech. preview)</title>
-	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.35/css/uikit.min.css">
+	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.2/css/uikit.min.css">
 	<link rel="stylesheet" type="text/css" href="../../media/css/dataTables.uikit.css">
 	<link rel="stylesheet" type="text/css" href="../resources/syntax/shCore.css">
 	<link rel="stylesheet" type="text/css" href="../resources/demo.css">
@@ -551,8 +551,7 @@ $(document).ready(function() {
 					<p>The following CSS library files are loaded for use in this example to provide the styling of the table:</p>
 					<ul>
 						<li>
-							<a href=
-							"https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.35/css/uikit.min.css">https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.35/css/uikit.min.css</a>
+							<a href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.2/css/uikit.min.css">https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.2/css/uikit.min.css</a>
 						</li>
 						<li>
 							<a href="../../media/css/dataTables.uikit.css">../../media/css/dataTables.uikit.css</a>
diff --git a/media/js/dataTables.uikit.js b/media/js/dataTables.uikit.js
index b2938e19..7b87a93c 100644
--- a/media/js/dataTables.uikit.js
+++ b/media/js/dataTables.uikit.js
@@ -50,8 +50,8 @@ $.extend( true, DataTable.defaults, {
 /* Default class modification */
 $.extend( DataTable.ext.classes, {
 	sWrapper:      "dataTables_wrapper uk-form dt-uikit",
-	sFilterInput:  "uk-form-small",
-	sLengthSelect: "uk-form-small",
+	sFilterInput:  "uk-form-small uk-input",
+	sLengthSelect: "uk-form-small uk-select",
 	sProcessing:   "dataTables_processing uk-panel"
 } );
 
diff --git a/media/js/dataTables.uikit.min.js b/media/js/dataTables.uikit.min.js
index c7680dbf..34d23502 100644
--- a/media/js/dataTables.uikit.min.js
+++ b/media/js/dataTables.uikit.min.js
@@ -5,7 +5,7 @@ var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(a,b,c){a
 $jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){a!=Array.prototype&&a!=Object.prototype&&(a[b]=c.value)};$jscomp.getGlobal=function(a){return"undefined"!=typeof window&&window===a?a:"undefined"!=typeof global&&null!=global?global:a};$jscomp.global=$jscomp.getGlobal(this);
 $jscomp.polyfill=function(a,b,c,e){if(b){c=$jscomp.global;a=a.split(".");for(e=0;e<a.length-1;e++){var d=a[e];d in c||(c[d]={});c=c[d]}a=a[a.length-1];e=c[a];b=b(e);b!=e&&null!=b&&$jscomp.defineProperty(c,a,{configurable:!0,writable:!0,value:b})}};$jscomp.polyfill("Array.prototype.find",function(a){return a?a:function(a,c){return $jscomp.findInternal(this,a,c).v}},"es6","es3");
 (function(a){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(b){return a(b,window,document)}):"object"===typeof exports?module.exports=function(b,c){b||(b=window);c&&c.fn.dataTable||(c=require("datatables.net")(b,c).$);return a(c,b,b.document)}:a(jQuery,window,document)})(function(a,b,c,e){var d=a.fn.dataTable;a.extend(!0,d.defaults,{dom:"<'row uk-grid'<'uk-width-1-2'l><'uk-width-1-2'f>><'row uk-grid dt-merge-grid'<'uk-width-1-1'tr>><'row uk-grid dt-merge-grid'<'uk-width-2-5'i><'uk-width-3-5'p>>",
-renderer:"uikit"});a.extend(d.ext.classes,{sWrapper:"dataTables_wrapper uk-form dt-uikit",sFilterInput:"uk-form-small",sLengthSelect:"uk-form-small",sProcessing:"dataTables_processing uk-panel"});d.ext.renderer.pageButton.uikit=function(b,e,v,p,l,r){var k=new d.Api(b),w=b.oClasses,m=b.oLanguage.oPaginate,x=b.oLanguage.oAria.paginate||{},g,f,t=0,u=function(c,d){var e,n=function(b){b.preventDefault();a(b.currentTarget).hasClass("disabled")||k.page()==b.data.action||k.page(b.data.action).draw("page")};
+renderer:"uikit"});a.extend(d.ext.classes,{sWrapper:"dataTables_wrapper uk-form dt-uikit",sFilterInput:"uk-form-small uk-input",sLengthSelect:"uk-form-small uk-select",sProcessing:"dataTables_processing uk-panel"});d.ext.renderer.pageButton.uikit=function(b,e,v,p,l,r){var k=new d.Api(b),w=b.oClasses,m=b.oLanguage.oPaginate,x=b.oLanguage.oAria.paginate||{},g,f,t=0,u=function(c,d){var e,n=function(b){b.preventDefault();a(b.currentTarget).hasClass("disabled")||k.page()==b.data.action||k.page(b.data.action).draw("page")};
 var q=0;for(e=d.length;q<e;q++){var h=d[q];if(a.isArray(h))u(c,h);else{f=g="";switch(h){case "ellipsis":g='<i class="uk-icon-ellipsis-h"></i>';f="uk-disabled disabled";break;case "first":g='<i class="uk-icon-angle-double-left"></i> '+m.sFirst;f=0<l?"":" uk-disabled disabled";break;case "previous":g='<i class="uk-icon-angle-left"></i> '+m.sPrevious;f=0<l?"":"uk-disabled disabled";break;case "next":g=m.sNext+' <i class="uk-icon-angle-right"></i>';f=l<r-1?"":"uk-disabled disabled";break;case "last":g=
 m.sLast+' <i class="uk-icon-angle-double-right"></i>';f=l<r-1?"":" uk-disabled disabled";break;default:g=h+1,f=l===h?"uk-active":""}if(g){var p=a("<li>",{"class":w.sPageButton+" "+f,id:0===v&&"string"===typeof h?b.sTableId+"_"+h:null}).append(a(-1!=f.indexOf("disabled")||-1!=f.indexOf("active")?"<span>":"<a>",{href:"#","aria-controls":b.sTableId,"aria-label":x[h],"data-dt-idx":t,tabindex:b.iTabIndex}).html(g)).appendTo(c);b.oApi._fnBindAction(p,{action:h},n);t++}}}};try{var n=a(e).find(c.activeElement).data("dt-idx")}catch(y){}u(a(e).empty().html('<ul class="uk-pagination uk-pagination-right uk-flex-right"/>').children("ul"),
 p);n&&a(e).find("[data-dt-idx="+n+"]").focus()};return d});