From c8d2ebedc1ac0e30e3ba574fcbd322a922ee8702 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Tue, 12 Nov 2013 19:18:18 +0000 Subject: [PATCH] Merge branch '1_10_wip' of github.com:DataTables/DataTablesSrc into 1_10_wip --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index ca19852a..cd39e722 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -8fa5b8aa7a24d4cc087a89f821095ad1756309da +319a8babbafdd3a87242271126086806252542c3 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 936a6634..3e1f7245 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -13680,7 +13680,7 @@ /** * Filter event, fired when the filtering applied to the table (using the - * build in global global filter, or column filters) is altered. + * built-in global filter, or column filters) is altered. * @name DataTable#filter * @event * @param {event} e jQuery event object @@ -13716,7 +13716,7 @@ /** * State save event, fired when the table has changed state a new state save - * is required. This method allows modification of the state saving object + * is required. This event allows modification of the state saving object * prior to actually doing the save, including addition or other state * properties (for plug-ins) or modification of a DataTables core property. * @name DataTable#stateSaveParams @@ -13750,7 +13750,7 @@ /** * Processing event, fired when DataTables is doing some kind of processing - * (be it, sort, filter or anything else). Can be used to indicate to the + * (be it, sort, filter or anything else). It can be used to indicate to the * end user that there is something happening, or that something has * finished. * @name DataTable#processing @@ -13820,7 +13820,7 @@ */ /** - * Column visibility has changes. + * Column visibility has changed. * @name DataTable#column-visibility * @event * @param {event} e jQuery event object