From a625218c7190a068d273221ad838781dfe1ea980 Mon Sep 17 00:00:00 2001 From: Garrett Hyder Date: Wed, 16 Sep 2020 16:50:13 -0700 Subject: [PATCH 01/11] Fix an issue where the Page Length Control would vanish when switching to 'All' (-1) as the option. Update now only makes the control vanish if the page size is smaller than the smallest length setting and we're only viewing a single or 0 pages. --- .../dataTables.conditionalPageLength.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/features/conditionalPageLength/dataTables.conditionalPageLength.js b/features/conditionalPageLength/dataTables.conditionalPageLength.js index 0f27d83..cc68d78 100644 --- a/features/conditionalPageLength/dataTables.conditionalPageLength.js +++ b/features/conditionalPageLength/dataTables.conditionalPageLength.js @@ -43,7 +43,12 @@ return; } - var options = dtSettings.oInit.conditionalPageLength || $.fn.dataTable.defaults.conditionalPageLength; + var options = dtSettings.oInit.conditionalPageLength || $.fn.dataTable.defaults.conditionalPageLength, + lengthMenu = dtSettings.aLengthMenu || $.fn.dataTable.defaults.lengthMenu, + lengthMenuValues = Array.isArray(lengthMenu[0]) ? lengthMenu[0] : lengthMenu; + + lengthMenuValues = lengthMenuValues.filter(function(n) { return n > 0 }); + var smallestLength = Math.min.apply(Math, lengthMenuValues); if ($.isPlainObject(options) || options === true) { var config = $.isPlainObject(options) ? options : {}, @@ -55,7 +60,7 @@ size = api.rows({search:'applied'}).count(); if (e instanceof $.Event) { - if (pages <= 1) { + if (pages <= 1 && size <= smallestLength) { if (config.style === 'fade') { $paging.stop().fadeTo(speed, 0); } @@ -72,7 +77,7 @@ } } } - else if (pages <= 1) { + else if (pages <= 1 && size <= smallestLength) { if (config.style === 'fade') { $paging.css('opacity', 0); } From 1cc821425b20330d46eab57228df1a33e70f7f84 Mon Sep 17 00:00:00 2001 From: SandyDataTables Date: Fri, 18 Sep 2020 07:18:02 +0000 Subject: [PATCH 02/11] Complete english file --- i18n/English.lang | 96 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 18 deletions(-) diff --git a/i18n/English.lang b/i18n/English.lang index 9806f48..9d84b9b 100644 --- a/i18n/English.lang +++ b/i18n/English.lang @@ -7,24 +7,84 @@ */ { - "sEmptyTable": "No data available in table", - "sInfo": "Showing _START_ to _END_ of _TOTAL_ entries", - "sInfoEmpty": "Showing 0 to 0 of 0 entries", - "sInfoFiltered": "(filtered from _MAX_ total entries)", - "sInfoThousands": ",", - "sLengthMenu": "Show _MENU_ entries", - "sLoadingRecords": "Loading...", - "sProcessing": "Processing...", - "sSearch": "Search:", - "sZeroRecords": "No matching records found", - "oPaginate": { - "sFirst": "First", - "sLast": "Last", - "sNext": "Next", - "sPrevious": "Previous" + "emptyTable": "No data available in table", + "info": "Showing _START_ to _END_ of _TOTAL_ entries", + "infoEmpty": "Showing 0 to 0 of 0 entries", + "infoFiltered": "(filtered from _MAX_ total entries)", + "infoThousands": ",", + "lengthMenu": "Show _MENU_ entries", + "loadingRecords": "Loading...", + "processing": "Processing...", + "search": "Search:", + "zeroRecords": "No matching records found", + "thousands": ",", + "paginate": { + "first": "First", + "last": "Last", + "next": "Next", + "previous": "Previous" }, - "oAria": { - "sSortAscending": ": activate to sort column ascending", - "sSortDescending": ": activate to sort column descending" + "aria": { + "sortAscending": ": activate to sort column ascending", + "sortDescending": ": activate to sort column descending" + }, + "autoFill": { + "cancel": "Cancel", + "fill": "Fill all cells with %d", + "fillHorizontal": "Fill cells horizontally", + "fillVertical": "Fill cells vertically" + }, + "buttons": { + "collection": "Collection ", + "colvis": "Column Visibility", + "colvisRestore": "Restore visibility", + "copy": "Copy", + "copyKeys": "Press ctrl or u2318 + C to copy the table data to your system clipboard.

To cancel, click this message or press escape.", + "copySuccess": { + "1": "Copied 1 row to clipboard", + "_": "Copied %d rows to clipboard" + }, + "copyTitle": "Copy to Clipboard", + "csv": "CSV", + "excel": "Excel", + "pageLength": { + "-1": "Show all rows", + "1": "Show 1 row", + "_": "Show %d rows" + }, + "pdf": "PDF", + "print": "Print" + }, + "searchBuilder": { + "add": "Add Condition", + "button": { + "0": "Search Builder", + "_": "Search Builder (%d)" + }, + "clearAll": "Clear All", + "condition": "Condition", + "data": "Data", + "deleteTitle": "Delete filtering rule", + "leftTitle": "Outdent Criteria", + "logicAnd": "And", + "logicOr": "Or", + "rightTitle": "Indent Criteria", + "title": { + "0": "Search Builder", + "_": "Search Builder (%d)" + }, + "value": "Value" + }, + "searchPanes": { + "clearMessage": "Clear All", + "collapse": { + "0": "SearchPanes", + "_": "SearchPanes (%d)" + }, + "count": "{total}", + "countFiltered": "{shown} ({total})", + "emptyPanes": "No SearchPanes", + "loadMessage": "Loading SearchPanes", + "title": "Filters Active - %d" } } \ No newline at end of file From d260b2282c759e3e002634ad356d08279492e292 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 18 Sep 2020 10:33:08 +0000 Subject: [PATCH 03/11] Remove use of deprecated $.isArray --- api/columns().order().js | 2 +- buttons/button.download.js | 2 +- features/lengthLinks/dataTables.lengthLinks.js | 4 ++-- sorting/absolute.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/columns().order().js b/api/columns().order().js index 46b6488..f169848 100644 --- a/api/columns().order().js +++ b/api/columns().order().js @@ -38,7 +38,7 @@ $.fn.dataTable.Api.register( 'columns().order()', function ( dir ) { var a = []; for ( var i=0, ien=columns.length ; i Date: Fri, 18 Sep 2020 10:59:27 +0000 Subject: [PATCH 04/11] Remove use of deprcated $.trim --- features/searchHighlight/dataTables.searchHighlight.js | 4 ++-- sorting/date-euro.js | 4 ++-- sorting/datetime-moment.js | 4 ++-- sorting/persian.js | 2 +- type-detection/num-html.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features/searchHighlight/dataTables.searchHighlight.js b/features/searchHighlight/dataTables.searchHighlight.js index d814f23..7d212cb 100644 --- a/features/searchHighlight/dataTables.searchHighlight.js +++ b/features/searchHighlight/dataTables.searchHighlight.js @@ -46,9 +46,9 @@ function highlight( body, table ) table.columns().every( function () { var column = this; column.nodes().flatten().to$().unhighlight({ className: 'column_highlight' }); - column.nodes().flatten().to$().highlight( $.trim( column.search() ).split(/\s+/), { className: 'column_highlight' } ); + column.nodes().flatten().to$().highlight( column.search().trim().split(/\s+/), { className: 'column_highlight' } ); } ); - body.highlight( $.trim( table.search() ).split(/\s+/) ); + body.highlight( table.search().trim().split(/\s+/) ); } } diff --git a/sorting/date-euro.js b/sorting/date-euro.js index 83aa8d2..326c812 100644 --- a/sorting/date-euro.js +++ b/sorting/date-euro.js @@ -25,8 +25,8 @@ "date-euro-pre": function ( a ) { var x; - if ( $.trim(a) !== '' ) { - var frDatea = $.trim(a).split(' '); + if ( a.trim() !== '' ) { + var frDatea = a.trim().split(' '); var frTimea = (undefined != frDatea[1]) ? frDatea[1].split(':') : [00,00,00]; var frDatea2 = frDatea[0].split('/'); x = (frDatea2[2] + frDatea2[1] + frDatea2[0] + frTimea[0] + frTimea[1] + ((undefined != frTimea[2]) ? frTimea[2] : 0)) * 1; diff --git a/sorting/datetime-moment.js b/sorting/datetime-moment.js index f937531..dd4aa93 100644 --- a/sorting/datetime-moment.js +++ b/sorting/datetime-moment.js @@ -40,7 +40,7 @@ $.fn.dataTable.moment = function ( format, locale, reverseEmpties ) { } // Strip out surrounding white space - d = $.trim( d ); + d = d.trim(); } // Null and empty values are acceptable @@ -62,7 +62,7 @@ $.fn.dataTable.moment = function ( format, locale, reverseEmpties ) { } // Strip out surrounding white space - d = $.trim( d ); + d = d.trim(); } return !moment(d, format, locale, true).isValid() ? diff --git a/sorting/persian.js b/sorting/persian.js index b5bf12a..21e3d5d 100644 --- a/sorting/persian.js +++ b/sorting/persian.js @@ -21,7 +21,7 @@ var persianSort = [ 'آ', 'ا', 'ب', 'پ', 'ت', 'ث', 'ج', 'چ', 'ح', 'خ', 'س', 'ش', 'ص', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ک', 'گ', 'ل', 'م', 'ن', 'و', 'ه', 'ی', 'ي' ]; function GetUniCode(source) { - source = $.trim(source); + source = source.trim(); var result = ''; var i, index; for (i = 0; i < source.length; i++) { diff --git a/type-detection/num-html.js b/type-detection/num-html.js index 077557d..eb2aea4 100644 --- a/type-detection/num-html.js +++ b/type-detection/num-html.js @@ -18,7 +18,7 @@ jQuery.fn.dataTableExt.aTypes.unshift( function ( sData ) { sData = typeof sData.replace == 'function' ? sData.replace( /<[\s\S]*?>/g, "" ) : sData; - sData = $.trim(sData); + sData = sData.trim(); var sValidFirstChars = "0123456789-"; var sValidChars = "0123456789."; From 876a4f7304d9dbcb563bafa328d8d15d2f0741a6 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Sun, 20 Sep 2020 11:52:18 +0700 Subject: [PATCH 05/11] Update Indonesian.lang Updated: s prefix removed in some variables, o prefix removed in oPaginate. Added: infoThousands, loadingRecords, thousands, aria, autofill, buttons, searchBuilder, searchPanes --- i18n/Indonesian.lang | 95 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 81 insertions(+), 14 deletions(-) diff --git a/i18n/Indonesian.lang b/i18n/Indonesian.lang index f7071a4..b61f6e2 100644 --- a/i18n/Indonesian.lang +++ b/i18n/Indonesian.lang @@ -2,23 +2,90 @@ * Indonesian translation * @name Indonesian * @anchor Indonesian - * @author Cipto Hadi + * @author Cipto Hadi, Ardeman, Landung Wahana * @lcid id */ { - "sEmptyTable": "Tidak ada data yang tersedia pada tabel ini", - "sProcessing": "Sedang memproses...", - "sLengthMenu": "Tampilkan _MENU_ entri", - "sZeroRecords": "Tidak ditemukan data yang sesuai", - "sInfo": "Menampilkan _START_ sampai _END_ dari _TOTAL_ entri", - "sInfoEmpty": "Menampilkan 0 sampai 0 dari 0 entri", - "sInfoFiltered": "(disaring dari _MAX_ entri keseluruhan)", - "sSearch": "Cari:", - "oPaginate": { - "sFirst": "Pertama", - "sPrevious": "Sebelumnya", - "sNext": "Selanjutnya", - "sLast": "Terakhir" + "emptyTable": "Tidak ada data yang tersedia pada tabel ini", + "info": "Menampilkan _START_ sampai _END_ dari _TOTAL_ entri", + "infoEmpty": "Menampilkan 0 sampai 0 dari 0 entri", + "infoFiltered": "(disaring dari _MAX_ entri keseluruhan)", + "infoThousands": "'", + "lengthMenu": "Tampilkan _MENU_ entri", + "loadingRecords": "Sedang memuat...", + "processing": "Sedang memproses...", + "search": "Cari:", + "zeroRecords": "Tidak ditemukan data yang sesuai", + "thousands": "'", + "paginate": { + "first": "Pertama", + "last": "Terakhir", + "next": "Selanjutnya", + "previous": "Sebelumnya" + }, + "aria": { + "sortAscending": ": aktifkan untuk mengurutkan kolom ke atas", + "sortDescending": ": aktifkan untuk mengurutkan kolom menurun" + }, + "autoFill": { + "cancel": "Batalkan", + "fill": "Isi semua sel dengan %d", + "fillHorizontal": "Isi sel secara horizontal", + "fillVertical": "Isi sel secara vertikal" + }, + "buttons": { + "collection": "Kumpulan ", + "colvis": "Visibilitas Kolom", + "colvisRestore": "Kembalikan visibilitas", + "copy": "Salin", + "copyKeys": "Tekan ctrl atau u2318 + C untuk menyalin tabel ke papan klip.

To membatalkan, klik pesan ini atau tekan esc.", + "copySuccess": { + "1": "1 baris disalin ke papan klip", + "_": "%d baris disalin ke papan klip" + }, + "copyTitle": "Salin ke Clipboard", + "csv": "CSV", + "excel": "Excel", + "pageLength": { + "-1": "Tampilkan semua baris", + "1": "Tampilkan 1 baris", + "_": "Tampilkan %d baris" + }, + "pdf": "PDF", + "print": "Cetak" + }, + "searchBuilder": { + "add": "Tambah Kondisi", + "button": { + "0": "Cari Builder", + "_": "Cari Builder (%d)" + }, + "clearAll": "Bersihkan Semua", + "condition": "Kondisi", + "data": "Data", + "deleteTitle": "Hapus filter", + "leftTitle": "Ke Kiri", + "logicAnd": "Dan", + "logicOr": "Atau", + "rightTitle": "Ke Kanan", + "title": { + "0": "Cari Builder", + "_": "Cari Builder (%d)" + }, + "value": "Nilai" + }, + "searchPanes": { + "clearMessage": "Bersihkan Semua", + "collapse": { + "0": "SearchPanes", + "_": "SearchPanes (%d)" + }, + "count": "{total}", + "countFiltered": "{shown} ({total})", + "emptyPanes": "Tidak Ada SearchPanes", + "loadMessage": "Memuat SearchPanes", + "title": "Filter Aktif - %d" } } + From fd800c1b5cec65eb62a7ae92f5b63151656ff260 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Sun, 20 Sep 2020 11:55:07 +0700 Subject: [PATCH 06/11] Update Indonesian.lang Translations of the deleted authors are not used --- i18n/Indonesian.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/Indonesian.lang b/i18n/Indonesian.lang index b61f6e2..b88e46d 100644 --- a/i18n/Indonesian.lang +++ b/i18n/Indonesian.lang @@ -2,7 +2,7 @@ * Indonesian translation * @name Indonesian * @anchor Indonesian - * @author Cipto Hadi, Ardeman, Landung Wahana + * @author Cipto Hadi, Ardeman * @lcid id */ From bc7860801a95ae831e3bdc86179be99280d9c753 Mon Sep 17 00:00:00 2001 From: sandyDatatables Date: Thu, 1 Oct 2020 14:51:21 +0000 Subject: [PATCH 07/11] update: Add SearchBuilder condition language options to English.lang file --- i18n/English.lang | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/i18n/English.lang b/i18n/English.lang index 9d84b9b..a559fdc 100644 --- a/i18n/English.lang +++ b/i18n/English.lang @@ -63,6 +63,49 @@ }, "clearAll": "Clear All", "condition": "Condition", + "conditions": { + "date": { + "after": "After", + "before": "Before", + "between": "Between", + "empty": "Empty", + "equals": "Equals", + "not": "Not", + "notBetween": "Not Between", + "notEmpty": "Not Empty", + }, + "moment": { + "after": "After", + "before": "Before", + "between": "Between", + "empty": "Empty", + "equals": "Equals", + "not": "Not", + "notBetween": "Not Between", + "notEmpty": "Not Empty", + }, + "number": { + "between": "Between", + "empty": "Empty", + "equals": "Equals", + "gt": "Greater Than", + "gte": "Greater Than Equal To", + "lt": "Less Than", + "lte": "Less Than Equal To", + "not": "Not", + "notBetween": "Not Between", + "notEmpty": "Not Empty", + }, + "string": { + "contains": "Contains", + "empty": "Empty", + "endsWith": "Ends With", + "equals": "Equals", + "not": "Not", + "notEmpty": "Not Empty", + "startsWith": "Starts With", + } + }, "data": "Data", "deleteTitle": "Delete filtering rule", "leftTitle": "Outdent Criteria", From b7d6c1615abd4db8e1600b2d09f878a950c5a579 Mon Sep 17 00:00:00 2001 From: sandyDatatables Date: Thu, 1 Oct 2020 15:10:32 +0000 Subject: [PATCH 08/11] dev: fix to validate json --- i18n/English.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/English.lang b/i18n/English.lang index a559fdc..1add0cd 100644 --- a/i18n/English.lang +++ b/i18n/English.lang @@ -72,7 +72,7 @@ "equals": "Equals", "not": "Not", "notBetween": "Not Between", - "notEmpty": "Not Empty", + "notEmpty": "Not Empty" }, "moment": { "after": "After", @@ -82,7 +82,7 @@ "equals": "Equals", "not": "Not", "notBetween": "Not Between", - "notEmpty": "Not Empty", + "notEmpty": "Not Empty" }, "number": { "between": "Between", @@ -94,7 +94,7 @@ "lte": "Less Than Equal To", "not": "Not", "notBetween": "Not Between", - "notEmpty": "Not Empty", + "notEmpty": "Not Empty" }, "string": { "contains": "Contains", @@ -103,7 +103,7 @@ "equals": "Equals", "not": "Not", "notEmpty": "Not Empty", - "startsWith": "Starts With", + "startsWith": "Starts With" } }, "data": "Data", From 5a7b0dfda59d0950e8e390f3f8f324cffa947703 Mon Sep 17 00:00:00 2001 From: Ahmad BD Date: Sat, 17 Oct 2020 13:49:42 +0300 Subject: [PATCH 09/11] Update Arabic.lang to include select and buttons --- i18n/Arabic.lang | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/i18n/Arabic.lang b/i18n/Arabic.lang index 3d26aa1..7c7f1fc 100644 --- a/i18n/Arabic.lang +++ b/i18n/Arabic.lang @@ -26,4 +26,26 @@ "sSortAscending": ": تفعيل لترتيب العمود تصاعدياً", "sSortDescending": ": تفعيل لترتيب العمود تنازلياً" } + "select": { + "rows": { + "_": "%d قيمة محددة", + "0": "", + "1": "1 قيمة محددة" + } + }, + "buttons": { + "print": "طباعة", + "colvis": "الأعمدة الظاهرة", + "copy": "نسخ إلى الحافظة", + "copyTitle": "نسخ", + "copyKeys": "زر ctrl أو \u2318 + C من الجدول
ليتم نسخها إلى الحافظة

للإلغاء اضغط على الرسالة أو اضغط على زر الخروج.", + "copySuccess": { + "_": "%d قيمة نسخت", + "1": "1 قيمة نسخت" + }, + "pageLength": { + "-1": "اظهار الكل", + "_": "إظهار %d أسطر" + } + } } From 4c7a531ec0bfac23811c984e22d67b54a9156448 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Sun, 18 Oct 2020 18:17:25 +0700 Subject: [PATCH 10/11] Update Indonesian.lang Fix translation for "clipboard" --- i18n/Indonesian.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/Indonesian.lang b/i18n/Indonesian.lang index b88e46d..313fbb6 100644 --- a/i18n/Indonesian.lang +++ b/i18n/Indonesian.lang @@ -44,7 +44,7 @@ "1": "1 baris disalin ke papan klip", "_": "%d baris disalin ke papan klip" }, - "copyTitle": "Salin ke Clipboard", + "copyTitle": "Salin ke Papan klip", "csv": "CSV", "excel": "Excel", "pageLength": { From 6ac307f3671253820182bad2200a9d226cd080fc Mon Sep 17 00:00:00 2001 From: sandyDatatables Date: Fri, 23 Oct 2020 10:22:07 +0000 Subject: [PATCH 11/11] dev: Fix JSON error in Arabic.lang --- i18n/Arabic.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/Arabic.lang b/i18n/Arabic.lang index 7c7f1fc..c29f19b 100644 --- a/i18n/Arabic.lang +++ b/i18n/Arabic.lang @@ -25,7 +25,7 @@ "oAria": { "sSortAscending": ": تفعيل لترتيب العمود تصاعدياً", "sSortDescending": ": تفعيل لترتيب العمود تنازلياً" - } + }, "select": { "rows": { "_": "%d قيمة محددة",