From a68379f7de7cad1dee3d5c83bdd77e1449a259fd Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 15 May 2014 10:08:56 +0100 Subject: [PATCH] Fix: Compatiblity with jQuery 1.7.0+ * jQuery before 1.8 didn't like append being given an array of mixed nodes and elements * This fixes DataTables/DataTables #320 --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 51bc790f..cd3538e2 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -49073a970defd030e8ad96c44f75eb5c85119380 +b00f14c5c5115a654e163607f5800f2e0227861c diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 0aef662b..f3b24f34 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -3207,7 +3207,7 @@ var a = settings.oLanguage.sLengthMenu.split(/(_MENU_)/); div.children().append( a.length > 1 ? - [ a[0], select, a[2] ] : + $(a[0]).add(select).add(a[2]) : a[0] );