From ec585db9785fd59d479b443b4b3cba88060dfc1c Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 14 Jun 2018 11:18:43 +0100 Subject: [PATCH] DEV more unit tests and more examples read --- .datatables-commit-sync | 2 +- examples/ajax/custom_data_property.html | 4 ++-- examples/ajax/null_data_source.html | 2 +- examples/ajax/simple.html | 2 +- examples/server_side/index.html | 8 ++++---- examples/server_side/select_rows.html | 4 ++-- examples/server_side/simple.html | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 6909a14d..07e06792 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -cbc6830a1c9581f6137b1c7be946dc875897285b +f3f84c92698f2df79e4b4ae954d01b7ba9e59068 diff --git a/examples/ajax/custom_data_property.html b/examples/ajax/custom_data_property.html index 7b6c58e1..ba393299 100644 --- a/examples/ajax/custom_data_property.html +++ b/examples/ajax/custom_data_property.html @@ -34,7 +34,7 @@ $(document).ready(function() {

DataTables example Custom data source property

When loading data from an Ajax source, by default, DataTables will look for the data to use in the data parameter of a returned object (e.g. - { "data": [...] }). This can easily be change by using the dataSrc option of the { "data": [...] }). This can easily be changed by using the dataSrc option of the ajax initiation option.

The ajax.dataSrc has a number of ways in which it can be used:

@@ -46,7 +46,7 @@ $(document).ready(function() {

The example below shows ajax.dataSrc being used as a string to get the data from a different source property, in this case demo but it could be any value, included a nested property by using standard dotted Javascript object notation.

+ "string" title="String">demo, but it could be any value, including a nested property using standard dotted Javascript object notation.

For more details on loading a DataTable with Ajax data, please refer to the Ajax section of the manual.

diff --git a/examples/ajax/null_data_source.html b/examples/ajax/null_data_source.html index 2439b39d..6ee0b6d1 100644 --- a/examples/ajax/null_data_source.html +++ b/examples/ajax/null_data_source.html @@ -58,7 +58,7 @@ $(document).ready(function() { bit of information about it in an alert box. This is a simple use case, but it can be built up to be arbitrarily complex.

Note also that the columns.data option for the column has been set to null to indicate that the column has no information - that should be obtained data source object.

+ contained in the data source object.

diff --git a/examples/ajax/simple.html b/examples/ajax/simple.html index dd7de79b..7f870fef 100644 --- a/examples/ajax/simple.html +++ b/examples/ajax/simple.html @@ -37,7 +37,7 @@ $(document).ready(function() { advanced configuration such as altering how the Ajax request is made. See the ajax documentation or the other Ajax examples for DataTables for further information.

By default DataTables will assume that an array data source is to be used and will read the information to be displayed in each column from the row's array - using the column index, making working with arrays very simple (note that this can be changed, or objects used may using the columns.data option, shown in other examples).

The example below shows DataTables loading data for a table from arrays as the data source, where the structure of the row's data source in this example is:

diff --git a/examples/server_side/index.html b/examples/server_side/index.html index a76bb01f..22fb649c 100644 --- a/examples/server_side/index.html +++ b/examples/server_side/index.html @@ -17,13 +17,13 @@

DataTables example Server-side processing

There are many ways to get your data into DataTables, and if you are working with seriously large databases, you might want to consider using the server-side - options that DataTables provides. With server-side processing enabled, all paging, searching, ordering etc actions that DataTables performs are handed off to a - server where an SQL engine (or similar) can perform these actions on the large data set (after all, that's what the database engine is designed for!). As such, - each draw of the table will result in a new Ajax request being made to get the required data.

+ options that DataTables provides. With server-side processing enabled, all actions that DataTables performs (such as paging, searching and ordering) are handed off + to a server where an SQL engine (or similar) can perform these actions on the large data set (after all, that's what the database engine is designed for!). As + such, each draw of the table will result in a new Ajax request to get the required data.

Server-side processing is enabled by setting the serverSide option to true and providing an Ajax data source through the ajax option.

-

The examples in this section shows server-side processing in use and how it can be customised to suit your needs.

+

The examples in this section show server-side processing in use and how it can be customised to suit your needs.

diff --git a/examples/server_side/select_rows.html b/examples/server_side/select_rows.html index 5af58528..8028803e 100644 --- a/examples/server_side/select_rows.html +++ b/examples/server_side/select_rows.html @@ -59,8 +59,8 @@ $(document).ready(function() { each draw.

This is shown in this demo, which uses a unique ID assigned to the TR element (this is done automatically through the use of the DT_RowId special property returned as part of the object given by the server for each row) to track which rows are selected and reselect them is appropriate on a draw.

-

If you are looking for a more complete and easier to use row selection option, check out the Select extension - provides an API that is fully integrated with DataTables for selecting rows and acting upon those selected rows.

+

If you are looking for a more complete and easier to use row selection option, the Select extension provides + an API that is fully integrated with DataTables for selecting rows and acting upon that selection.

diff --git a/examples/server_side/simple.html b/examples/server_side/simple.html index 1f66934e..234f1862 100644 --- a/examples/server_side/simple.html +++ b/examples/server_side/simple.html @@ -33,9 +33,9 @@ $(document).ready(function() {

DataTables example Server-side processing

There are many ways to get your data into DataTables, and if you are working with seriously large databases, you might want to consider using the server-side - options that DataTables provides. With server-side processing enabled, all paging, searching, ordering etc actions that DataTables performs are handed off to a - server where an SQL engine (or similar) can perform these actions on the large data set (after all, that's what the database engine is designed for!). As such, - each draw of the table will result in a new Ajax request being made to get the required data.

+ options that DataTables provides. With server-side processing enabled, all actions that DataTables performs (such as paging, searching and ordering) are handed off + to a server where an SQL engine (or similar) can perform these actions on the large data set (after all, that's what the database engine is designed for!). As + such, each draw of the table will result in a new Ajax request to get the required data.

Server-side processing is enabled by setting the serverSide option to true and providing an Ajax data source through the ajax option.