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 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); } diff --git a/features/lengthLinks/dataTables.lengthLinks.js b/features/lengthLinks/dataTables.lengthLinks.js index 51a4690..8304eaf 100644 --- a/features/lengthLinks/dataTables.lengthLinks.js +++ b/features/lengthLinks/dataTables.lengthLinks.js @@ -58,8 +58,8 @@ $.fn.dataTable.LengthLinks = function ( inst ) { } var menu = settings.aLengthMenu; - var lang = menu.length===2 && $.isArray(menu[0]) ? menu[1] : menu; - var lens = menu.length===2 && $.isArray(menu[0]) ? menu[0] : menu; + var lang = menu.length===2 && Array.isArray(menu[0]) ? menu[1] : menu; + var lens = menu.length===2 && Array.isArray(menu[0]) ? menu[0] : menu; var out = $.map( lens, function (el, i) { return el == api.page.len() ? 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/i18n/Arabic.lang b/i18n/Arabic.lang index 3d26aa1..c29f19b 100644 --- a/i18n/Arabic.lang +++ b/i18n/Arabic.lang @@ -25,5 +25,27 @@ "oAria": { "sSortAscending": ": تفعيل لترتيب العمود تصاعدياً", "sSortDescending": ": تفعيل لترتيب العمود تنازلياً" + }, + "select": { + "rows": { + "_": "%d قيمة محددة", + "0": "", + "1": "1 قيمة محددة" + } + }, + "buttons": { + "print": "طباعة", + "colvis": "الأعمدة الظاهرة", + "copy": "نسخ إلى الحافظة", + "copyTitle": "نسخ", + "copyKeys": "زر ctrl أو \u2318 + C من الجدول
ليتم نسخها إلى الحافظة

للإلغاء اضغط على الرسالة أو اضغط على زر الخروج.", + "copySuccess": { + "_": "%d قيمة نسخت", + "1": "1 قيمة نسخت" + }, + "pageLength": { + "-1": "اظهار الكل", + "_": "إظهار %d أسطر" + } } } diff --git a/i18n/English.lang b/i18n/English.lang index 9806f48..1add0cd 100644 --- a/i18n/English.lang +++ b/i18n/English.lang @@ -7,24 +7,127 @@ */ { - "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", + "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", + "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 diff --git a/i18n/Indonesian.lang b/i18n/Indonesian.lang index f7071a4..313fbb6 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 * @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 Papan klip", + "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" } } + diff --git a/sorting/absolute.js b/sorting/absolute.js index 35587b3..f14ad5a 100644 --- a/sorting/absolute.js +++ b/sorting/absolute.js @@ -69,7 +69,7 @@ var _unique = 0; // Function to encapsulate code that is common to both the string and number // ordering plug-ins. var _setup = function ( values ) { - if ( ! $.isArray( values ) ) { + if ( ! Array.isArray( values ) ) { values = [ values ]; } 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.";