Merge remote-tracking branch 'upstream/master'

Author: ferranmesas

build/examples.php

@@ -240,19 +240,19 @@
 // Styling libraries
 // When updating these files, make sure you also update the `karma.config` tests
 // file to match versions.
-DT_Example::$lookup_libraries['js' ]['jquery']       = '//code.jquery.com/jquery-1.12.3.js';
+DT_Example::$lookup_libraries['js' ]['jquery']       = '//code.jquery.com/jquery-1.12.4.js';
 DT_Example::$lookup_libraries['js' ]['jqueryui']     = '//code.jquery.com/ui/1.11.4/jquery-ui.js';
 DT_Example::$lookup_libraries['css']['jqueryui']     = '//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css';
-DT_Example::$lookup_libraries['js' ]['bootstrap']    = '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js';
-DT_Example::$lookup_libraries['css']['bootstrap']    = '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css';
-DT_Example::$lookup_libraries['js']['bootstrap4']    = '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/js/bootstrap.min.js';
-DT_Example::$lookup_libraries['css' ]['bootstrap4']  = '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.css';
-DT_Example::$lookup_libraries['js' ]['semanticui']   = '//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.1/semantic.min.js';
-DT_Example::$lookup_libraries['css']['semanticui']   = '//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.1/semantic.min.css';
+DT_Example::$lookup_libraries['js' ]['bootstrap']    = '//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js';
+DT_Example::$lookup_libraries['css']['bootstrap']    = '//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css';
+DT_Example::$lookup_libraries['js']['bootstrap4']    = '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.6/js/bootstrap.min.js';
+DT_Example::$lookup_libraries['css' ]['bootstrap4']  = '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.6/css/bootstrap.css';
+DT_Example::$lookup_libraries['js' ]['semanticui']   = '//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.6/semantic.min.js';
+DT_Example::$lookup_libraries['css']['semanticui']   = '//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.6/semantic.min.css';
 DT_Example::$lookup_libraries['js' ]['material']     = '//cdnjs.cloudflare.com/ajax/libs/material-design-lite/1.1.0/material.min.js';
 DT_Example::$lookup_libraries['css']['material']     = '//cdnjs.cloudflare.com/ajax/libs/material-design-lite/1.1.0/material.min.css';
-DT_Example::$lookup_libraries['js' ]['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/6.1.1/foundation.min.js';
-DT_Example::$lookup_libraries['css']['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/6.1.1/foundation.min.css';
+DT_Example::$lookup_libraries['js' ]['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/6.2.4/foundation.min.js';
+DT_Example::$lookup_libraries['css']['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/6.2.4/foundation.min.css';
 DT_Example::$lookup_libraries['js' ]['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/5.5.2/js/foundation.min.js';
 DT_Example::$lookup_libraries['css']['foundation']   = '//cdnjs.cloudflare.com/ajax/libs/foundation/5.5.2/css/foundation.min.css';
 DT_Example::$lookup_libraries['js' ]['uikit']        = '//cdnjs.cloudflare.com/ajax/libs/uikit/2.24.3/js/uikit.min.js';
@@ -654,6 +654,66 @@ function sql_files ( $out_dir )
 SET IDENTITY_INSERT datatables_demo OFF;
 EOD;
 	file_put_contents( $out_dir.'/sqlserver.sql', $str );
+
+	// Oracle style
+	$str = <<<EOD
+--
+-- DataTables Ajax and server-side processing database (SQL Server)
+--
+BEGIN
+	EditorDelObject('datatables_demo', 'TABLE');
+	EditorDelObject('datatables_demo_seq', 'SEQUENCE');
+END;
+
+CREATE TABLE datatables_demo (
+	id INT PRIMARY KEY NOT NULL,
+	first_name VARCHAR(250),
+	last_name  VARCHAR(250),
+	position   VARCHAR(250),
+	email      VARCHAR(250),
+	office     VARCHAR(250),
+	start_date DATE,
+	age        INT,
+	salary     INT,
+	seq        INT,
+	extn       VARCHAR(8)
+);
+
+CREATE SEQUENCE datatables_demo_seq;
+
+CREATE OR REPLACE TRIGGER datatables_demo_on_insert
+	BEFORE INSERT ON datatables_demo
+	FOR EACH ROW
+	BEGIN
+		SELECT datatables_demo_seq.nextval
+		INTO :new.id
+		FROM dual;
+	END;
+
+EOD;
+
+	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+		$str .= "INSERT INTO datatables_demo ".
+			"( first_name, last_name, age, position, salary, start_date, extn, email, office, seq ) ".
+			"VALUES ";
+
+		$str .= "( ".
+			"'".$json[$i]['first_name']."', ".
+			"'".$json[$i]['last_name']."', ".
+			    $json[$i]['age'].", ".
+			"'".$json[$i]['position']."', ".
+			    $json[$i]['salary'].", ".
+			"'".date('d-M-Y', strtotime($json[$i]['start_date']))."', ".
+			    $json[$i]['extn'].", ".
+			"'".$json[$i]['email']."', ".
+			"'".$json[$i]['office']."', ".
+			    $json[$i]['sequence']." ".
+		");\n";
+	}
+
+	$str .= "\nCOMMIT;\n";
+
+	file_put_contents( $out_dir.'/oracle.sql', $str );
 }
 
 

build/lib/DT_Example.php

@@ -204,7 +204,7 @@ private function _htmlTidy( $html )
 		$tidy->parseString( $html, array(
 			'indent' => 2,
 			'indent-spaces' => 4,
-			'new-blocklevel-tags' => 'section',
+			'new-blocklevel-tags' => 'section,editor-field',
 			'new-pre-tags' => 'script',
 			'new-empty-tags' => 'tbody',
 			'output-html' => 1,

build/make.sh

@@ -282,7 +282,7 @@ function build_extension {
 		# If there is a make file, then leave it to the extension to do its own
 		# build and copy files into place
 		echo_msg "Running $EXTENSION build script"
-		sh ${BASE_DIR}/extensions/${EXTENSION}/make.sh \
+		bash ${BASE_DIR}/extensions/${EXTENSION}/make.sh \
 			${BUILD_DIR}/DataTables/extensions/${EXTENSION} $DEBUG
 	else
 		# Otherwise, just copy the whole lot over
@@ -314,10 +314,11 @@ function usage {
 
       test     - Build the unit tests
 
+	  all [debug] - Build DataTables core and all extensions
+
       extension <ext> [debug] - Extension to build where <ext> is one of:
         - AutoFill
         - Buttons
-        - ColVis
         - ColReorder
         - FixedColumns
         - FixedHeader
@@ -326,7 +327,6 @@ function usage {
         - Responsive
         - Scroller
         - Select
-        - TableTools
 
     and the optional [debug] parameter can be used to disable JS and CSS
     compression for faster development build times."
@@ -357,6 +357,22 @@ case "$1" in
 		build_repo
 		;;
 
+	"all")
+		build_repo
+		build_extension AutoFill
+		build_extension Buttons
+		build_extension ColReorder
+		build_extension FixedColumns
+		build_extension FixedHeader
+		build_extension KeyTable
+		build_extension Responsive
+		build_extension Scroller
+		build_extension Select
+		if [ -d ../extensions/Editor ]; then
+			build_extension Editor
+		fi
+		;;
+
 	"examples")
 		build_examples
 		;;

build/templates/example.html

@@ -24,7 +24,9 @@ <h1>{software} example <span>{title}</span></h1>
 					{info}
 				</div>
 
-				{demo-html}
+				<div class="demo-html">
+					{demo-html}
+				</div>
 				{table}
 
 				<ul class="tabs">

css/dataTables.bootstrap.scss

@@ -9,7 +9,6 @@ table.dataTable {
 	td,
 	th {
 		-webkit-box-sizing: content-box;
-		-moz-box-sizing: content-box;
 		box-sizing: content-box;
 
 		&.dataTables_empty {
@@ -147,27 +146,27 @@ div.dataTables_scrollHead table.dataTable {
 }
 
 div.dataTables_scrollBody {
-	table {
+	> table {
 		border-top: none;
 		margin-top: 0 !important;
 		margin-bottom: 0 !important;
 
-		thead { // Hide sort icons
+		> thead { // Hide sort icons
 			.sorting:after,
 			.sorting_asc:after,
 			.sorting_desc:after {
 				display: none;
 			}
 		}
 
-		tbody tr:first-child th,
-		tbody tr:first-child td {
+		> tbody > tr:first-child > th,
+		> tbody > tr:first-child > td {
 			border-top: none;
 		}
 	}
 }
 
-div.dataTables_scrollFoot table {
+div.dataTables_scrollFoot > table {
 	margin-top: 0 !important;
 	border-top: none;
 }

css/dataTables.bootstrap4.scss

@@ -72,6 +72,7 @@ div.dataTables_wrapper {
 		ul.pagination {
 			margin: 2px 0;
 			white-space: nowrap;
+			justify-content: flex-end;
 		}
 	}
 

css/dataTables.semanticui.scss

@@ -43,7 +43,6 @@ table.dataTable.table {
 	td,
 	th {
 		-webkit-box-sizing: content-box;
-		-moz-box-sizing: content-box;
 		box-sizing: content-box;
 
 		&.dataTables_empty {

css/jquery.dataTables.scss

@@ -530,19 +530,21 @@ table.dataTable td {
 			*margin-top: -1px;
 			-webkit-overflow-scrolling: touch;
 
-			th, td {
-				// Setting v-align baseline can cause the headers to be visible
-				vertical-align: middle;
-			}
-
-			th > div.dataTables_sizing,
-			td > div.dataTables_sizing {
-				// Hide the element used to wrap the content in the header for
-				// the body scrolling table
-				height: 0;
-				overflow: hidden;
-				margin: 0 !important;
-				padding: 0 !important;
+			> table > thead > tr, > table > tbody > tr {
+				> th, > td {
+					// Setting v-align baseline can cause the headers to be visible
+					vertical-align: middle;
+				}
+
+				> th > div.dataTables_sizing,
+				> td > div.dataTables_sizing {
+					// Hide the element used to wrap the content in the header for
+					// the body scrolling table
+					height: 0;
+					overflow: hidden;
+					margin: 0 !important;
+					padding: 0 !important;
+				}
 			}
 		}
 	}
@@ -552,8 +554,8 @@ table.dataTable td {
 			border-bottom: $table-header-border;
 		}
 
-		div.dataTables_scrollHead table,
-		div.dataTables_scrollBody table {
+		div.dataTables_scrollHead > table,
+		div.dataTables_scrollBody > table {
 			border-bottom: none;
 		}
 	}

docs/option/columns.orderData.xml

@@ -15,9 +15,9 @@
 	</default>
 
 	<description>
-		Allows a column's sorting to take multiple columns into account when doing a order.
+		Allows a column's sorting to take either the data from a different (often hidden) column as the data to sort, or data from multiple columns.
 
-		For example with first name / last name columns next to each other, it is intuitive that they would be linked together to multi-column sort.
+		A common example of this is a table which contains first and last name columns next to each other, it is intuitive that they would be linked together to multi-column sort. Another example, with a single column, is the case where the data shown to the end user is not directly sortable itself (a column with images in it), but there is some meta data than can be sorted (e.g. file name) - note that [orthogonal data](/manual/data/orthogonal) is an alternative method that can be used for this.
 	</description>
 
 	<example title="Using `orderData` to define multi-column sorting with `dt-init columnDefs`"><![CDATA[

docs/option/language.infoEmpty.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dt-option group="i18n">
 	<name>language.infoEmpty</name>
-	<summary>Table summary information string used when the table is empty or records</summary>
+	<summary>Table summary information string used when the table is empty of records</summary>
 	<since>1.10</since>
 
 	<type type="string" />