diff --git a/.datatables-commit-sync b/.datatables-commit-sync index cc76d89f..6c701c1a 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -5fd86f5bbcd9e59c4760202d55e4f5e33bd0f8ed +4e5a0aee5316508870d05d64e9dbacd3ef289441 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 9e3dc41d..c8a9361e 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -104,7 +104,6 @@ var _re_new_lines = /[\r\n]/g; var _re_html = /<.*?>/g; var _re_formatted_numeric = /[',$£€¥%]/g; - var _re_date_start = /^[\d\+\-a-zA-Z]/; @@ -2521,12 +2520,11 @@ var tableId = settings.sTableId; var previousSearch = settings.oPreviousSearch; var features = settings.aanFeatures; - var input = ''; var str = settings.oLanguage.sSearch; str = str.match(/_INPUT_/) ? - str.replace('_INPUT_', input) : - str+input; + str.replace('_INPUT_', '') : + str+''; var filter = $('
', { 'id': ! features.f ? tableId+'_filter' : null, @@ -8379,30 +8377,30 @@ /** * Check if a `` node is a DataTable table already or not. * - * @param {node|jquery|string} table Table node, jQuery object or jQuery - * selector for the table to test. Note that if more than more than one - * table is passed on, only the first will be checked + * @param {node} table The `table` node to check if it is a DataTable or not + * (note that other node types can be passed in, but will always return + * false). * @returns {boolean} true the table given is a DataTable, or false otherwise * @static * @dtopt API-Static * * @example - * if ( ! $.fn.DataTable.isDataTable( '#example' ) ) { - * $('#example').dataTable(); + * var ex = document.getElementById('example'); + * if ( ! $.fn.DataTable.isDataTable( ex ) ) { + * $(ex).dataTable(); * } */ DataTable.isDataTable = DataTable.fnIsDataTable = function ( table ) { - var t = $(table).get(0); - var is = false; + var o = DataTable.settings; - $.each( DataTable.settings, function (i, o) { - if ( o.nTable === t || o.nScrollHead === t || o.nScrollFoot === t ) { - is = true; + for ( var i=0 ; i