From e06931ee0bebaea9a96a16d2ed49d8ab3633579e Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 10 Oct 2014 10:54:11 +0100 Subject: [PATCH] Fix example: Improve code for multi-column `select` example --- .datatables-commit-sync | 2 +- bower.json | 2 +- composer.json | 2 +- dataTables.jquery.json | 2 +- examples/api/multi_filter_select.html | 6 ++---- media/js/jquery.dataTables.min.js | 2 +- package.json | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index e699d772..82ab2174 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -ddb316f8b4c3d8938778cf65d0be6d717d87d00d +a9bbdfbf0a63a9bc54a743172e873cc1d5045973 diff --git a/bower.json b/bower.json index 9e1e9650..0e705048 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "datatables", - "version": "1.10.3", + "version": "1.10.4-dev", "main": [ "media/js/jquery.dataTables.js", "media/css/jquery.dataTables.css" diff --git a/composer.json b/composer.json index 031bed25..72f3e32e 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "datatables/datatables", - "version": "1.10.3", + "version": "1.10.4-dev", "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.", "homepage": "http://www.datatables.net/", "author": "SpryMedia", diff --git a/dataTables.jquery.json b/dataTables.jquery.json index 46291ec0..a5cc1a1e 100644 --- a/dataTables.jquery.json +++ b/dataTables.jquery.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.3", + "version": "1.10.4-dev", "description": "DataTables enhances HTML tables with the ability to sort, filter and page the data in the table very easily. It provides a comprehensive API and set of configuration options, allowing you to consume data from virtually any data source.", "homepage": "http://datatables.net/", "docs": "http://datatables.net/", diff --git a/examples/api/multi_filter_select.html b/examples/api/multi_filter_select.html index 3f467541..bbf07b78 100644 --- a/examples/api/multi_filter_select.html +++ b/examples/api/multi_filter_select.html @@ -26,14 +26,13 @@ $(document).ready(function() { api.columns().indexes().flatten().each( function ( i ) { var column = api.column( i ); - console.log( i ); var select = $('') .appendTo( $(column.footer()).empty() ) .on( 'change', function () { var val = $(this).val(); column - .search( val ? '^'+$(this).val()+'$' : val, true, false ) + .search( val ? '^'+val+'$' : '', true, false ) .draw(); } ); @@ -592,14 +591,13 @@ $(document).ready(function() { api.columns().indexes().flatten().each( function ( i ) { var column = api.column( i ); - console.log( i ); var select = $('<select><option value=""></option></select>') .appendTo( $(column.footer()).empty() ) .on( 'change', function () { var val = $(this).val(); column - .search( val ? '^'+$(this).val()+'$' : val, true, false ) + .search( val ? '^'+val+'$' : '', true, false ) .draw(); } ); diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index 9b72ba30..2de97abc 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -1,4 +1,4 @@ -/*! DataTables 1.10.3 +/*! DataTables 1.10.4-dev * ©2008-2014 SpryMedia Ltd - datatables.net/license */ (function(Da,P,l){var O=function(h){function V(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),d[c]=e,"o"===b[1]&&V(a[e])});a._hungarianMap=d}function G(a,b,c){a._hungarianMap||V(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==l&&(c||b[d]===l))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),G(a[d],b[d],c)):b[d]=b[e]})}function O(a){var b=p.defaults.oLanguage,c=a.sZeroRecords; diff --git a/package.json b/package.json index fb034b9d..df9282f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.3", + "version": "1.10.4-dev", "title": "DataTables", "author": { "name": "Allan Jardine",