jquery-datatables 1.10.15 → 1.10.16

data/app/assets/javascripts/datatables/extensions/Buttons/buttons.foundation.js

@@ -49,7 +49,9 @@ var collection = DataTable.ext.foundationVersion === 6 ?
 		className: 'dt-button-collection f-dropdown open dropdown-pane is-open',
 		button: {
 			tag: 'li',
-			className: 'small'
+			className: 'small',
+			active: 'active',
+			disabled: 'disabled'
 		},
 		buttonLiner: {
 			tag: 'a'

data/app/assets/javascripts/datatables/extensions/Buttons/buttons.html5.js

@@ -228,35 +228,6 @@ DataTable.fileSave = _saveAs;
  * Local (private) functions
  */
 
-/**
- * Get the file name for an exported file.
- *
- * @param {object}	config Button configuration
- * @param {boolean} incExtension Include the file name extension
- */
-var _filename = function ( config, incExtension )
-{
-	// Backwards compatibility
-	var filename = config.filename === '*' && config.title !== '*' && config.title !== undefined ?
-		config.title :
-		config.filename;
-
-	if ( typeof filename === 'function' ) {
-		filename = filename();
-	}
-
-	if ( filename.indexOf( '*' ) !== -1 ) {
-		filename = $.trim( filename.replace( '*', $('title').text() ) );
-	}
-
-	// Strip characters which the OS will object to
-	filename = filename.replace(/[^a-zA-Z0-9_\u00A1-\uFFFF\.,\-_ !\(\)]/g, "");
-
-	return incExtension === undefined || incExtension === true ?
-		filename+config.extension :
-		filename;
-};
-
 /**
  * Get the sheet name for Excel exports.
  *
@@ -270,25 +241,7 @@ var _sheetname = function ( config )
 		sheetName = config.sheetName.replace(/[\[\]\*\/\\\?\:]/g, '');
 	}
 
-return sheetName;
-};
-
-/**
- * Get the title for an exported file.
- *
- * @param {object} config	Button configuration
- */
-var _title = function ( config )
-{
-	var title = config.title;
-
-	if ( typeof title === 'function' ) {
-		title = title();
-	}
-
-	return title.indexOf( '*' ) !== -1 ?
-		title.replace( '*', $('title').text() || 'Exported data' ) :
-		title;
+	return sheetName;
 };
 
 /**
@@ -498,13 +451,13 @@ function _createNode( doc, nodeName, opts ) {
 			$(tempNode).attr( opts.attr );
 		}
 
-		if( opts.children ) {
+		if ( opts.children ) {
 			$.each( opts.children, function ( key, value ) {
 				tempNode.appendChild( value );
-			});
+			} );
 		}
 
-		if( opts.text ) {
+		if ( opts.text !== null && opts.text !== undefined ) {
 			tempNode.appendChild( doc.createTextNode( opts.text ) );
 		}
 	}
@@ -605,6 +558,7 @@ var excelStrings = {
 		'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+
 		'<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'+
 			'<sheetData/>'+
+			'<mergeCells count="0"/>'+
 		'</worksheet>',
 
 	"xl/styles.xml":
@@ -831,6 +785,8 @@ DataTable.ext.buttons.copyHtml5 = {
 
 		var that = this;
 		var exportData = _exportData( dt, config );
+		var info = dt.buttons.exportInfo( config );
+		var newline = _newLine(config);
 		var output = exportData.str;
 		var hiddenDiv = $('<div/>')
 			.css( {
@@ -842,6 +798,18 @@ DataTable.ext.buttons.copyHtml5 = {
 				left: 0
 			} );
 
+		if ( info.title ) {
+			output = info.title + newline + newline + output;
+		}
+
+		if ( info.messageTop ) {
+			output = info.messageTop + newline + newline + output;
+		}
+
+		if ( info.messageBottom ) {
+			output = output + newline + newline + info.messageBottom;
+		}
+
 		if ( config.customize ) {
 			output = config.customize( output, config );
 		}
@@ -921,7 +889,13 @@ DataTable.ext.buttons.copyHtml5 = {
 
 	header: true,
 
-	footer: false
+	footer: false,
+
+	title: '*',
+
+	messageTop: '*',
+
+	messageBottom: '*'
 };
 
 //
@@ -945,6 +919,7 @@ DataTable.ext.buttons.csvHtml5 = {
 
 		// Set the text
 		var output = _exportData( dt, config ).str;
+		var info = dt.buttons.exportInfo(config);
 		var charset = config.charset;
 
 		if ( config.customize ) {
@@ -970,7 +945,7 @@ DataTable.ext.buttons.csvHtml5 = {
 
 		_saveAs(
 			new Blob( [output], {type: 'text/csv'+charset} ),
-			_filename( config ),
+			info.filename,
 			true
 		);
 
@@ -1144,9 +1119,34 @@ DataTable.ext.buttons.excelHtml5 = {
 			config.customizeData( data );
 		}
 
+		var mergeCells = function ( row, colspan ) {
+			var mergeCells = $('mergeCells', rels);
+
+			mergeCells[0].appendChild( _createNode( rels, 'mergeCell', {
+				attr: {
+					ref: 'A'+row+':'+createCellPos(colspan)+row
+				}
+			} ) );
+			mergeCells.attr( 'count', mergeCells.attr( 'count' )+1 );
+			$('row:eq('+(row-1)+') c', rels).attr( 's', '51' ); // centre
+		};
+
+		// Title and top messages
+		var exportInfo = dt.buttons.exportInfo( config );
+		if ( exportInfo.title ) {
+			addRow( [exportInfo.title], rowPos );
+			mergeCells( rowPos, data.header.length-1 );
+		}
+
+		if ( exportInfo.messageTop ) {
+			addRow( [exportInfo.messageTop], rowPos );
+			mergeCells( rowPos, data.header.length-1 );
+		}
+
+		// Table itself
 		if ( config.header ) {
 			addRow( data.header, rowPos );
-			$('row c', rels).attr( 's', '2' ); // bold
+			$('row:last c', rels).attr( 's', '2' ); // bold
 		}
 
 		for ( var n=0, ie=data.body.length ; n<ie ; n++ ) {
@@ -1158,6 +1158,12 @@ DataTable.ext.buttons.excelHtml5 = {
 			$('row:last c', rels).attr( 's', '2' ); // bold
 		}
 
+		// Below the table
+		if ( exportInfo.messageBottom ) {
+			addRow( [exportInfo.messageBottom], rowPos );
+			mergeCells( rowPos, data.header.length-1 );
+		}
+
 		// Set column widths
 		var cols = _createNode( rels, 'cols' );
 		$('worksheet', rels).prepend( cols );
@@ -1192,7 +1198,7 @@ DataTable.ext.buttons.excelHtml5 = {
 			zip
 				.generateAsync( zipConfig )
 				.then( function ( blob ) {
-					_saveAs( blob, _filename( config ) );
+					_saveAs( blob, exportInfo.filename );
 					that.processing( false );
 				} );
 		}
@@ -1200,7 +1206,7 @@ DataTable.ext.buttons.excelHtml5 = {
 			// JSZip 2.5
 			_saveAs(
 				zip.generate( zipConfig ),
-				_filename( config )
+				exportInfo.filename
 			);
 			this.processing( false );
 		}
@@ -1214,7 +1220,13 @@ DataTable.ext.buttons.excelHtml5 = {
 
 	header: true,
 
-	footer: false
+	footer: false,
+
+	title: '*',
+
+	messageTop: '*',
+
+	messageBottom: '*'
 };
 
 //
@@ -1236,6 +1248,7 @@ DataTable.ext.buttons.pdfHtml5 = {
 
 		var that = this;
 		var data = dt.buttons.exportData( config.exportOptions );
+		var info = dt.buttons.exportInfo( config );
 		var rows = [];
 
 		if ( config.header ) {
@@ -1306,17 +1319,25 @@ DataTable.ext.buttons.pdfHtml5 = {
 			}
 		};
 
-		if ( config.message ) {
+		if ( info.messageTop ) {
 			doc.content.unshift( {
-				text: typeof config.message == 'function' ? config.message(dt, button, config) : config.message,
+				text: info.messageTop,
 				style: 'message',
 				margin: [ 0, 0, 0, 12 ]
 			} );
 		}
 
-		if ( config.title ) {
+		if ( info.messageBottom ) {
+			doc.content.push( {
+				text: info.messageBottom,
+				style: 'message',
+				margin: [ 0, 0, 0, 12 ]
+			} );
+		}
+
+		if ( info.title ) {
 			doc.content.unshift( {
-				text: _title( config, false ),
+				text: info.title,
 				style: 'title',
 				margin: [ 0, 0, 0, 12 ]
 			} );
@@ -1336,7 +1357,7 @@ DataTable.ext.buttons.pdfHtml5 = {
 			pdf.getBuffer( function (buffer) {
 				var blob = new Blob( [buffer], {type:'application/pdf'} );
 
-				_saveAs( blob, _filename( config ) );
+				_saveAs( blob, info.filename );
 				that.processing( false );
 			} );
 		}
@@ -1358,7 +1379,9 @@ DataTable.ext.buttons.pdfHtml5 = {
 
 	footer: false,
 
-	message: null,
+	messageTop: '*',
+
+	messageBottom: '*',
 
 	customize: null,
 

data/app/assets/javascripts/datatables/extensions/Buttons/buttons.print.js

@@ -87,7 +87,11 @@ DataTable.ext.buttons.print = {
 	},
 
 	action: function ( e, dt, button, config ) {
-		var data = dt.buttons.exportData( config.exportOptions );
+		var data = dt.buttons.exportData(
+			$.extend( {decodeEntities: false}, config.exportOptions ) // XSS protection
+		);
+		var exportInfo = dt.buttons.exportInfo( config );
+
 		var addRow = function ( d, tag ) {
 			var str = '<tr>';
 
@@ -114,26 +118,17 @@ DataTable.ext.buttons.print = {
 		if ( config.footer && data.footer ) {
 			html += '<tfoot>'+ addRow( data.footer, 'th' ) +'</tfoot>';
 		}
+		html += '</table>';
 
 		// Open a new window for the printable table
 		var win = window.open( '', '' );
-		var title = config.title;
-
-		if ( typeof title === 'function' ) {
-			title = title();
-		}
-
-		if ( title.indexOf( '*' ) !== -1 ) {
-			title= title.replace( '*', $('title').text() );
-		}
-
 		win.document.close();
 
 		// Inject the title and also a copy of the style and link tags from this
 		// document so the table can retain its base styling. Note that we have
 		// to use string manipulation as IE won't allow elements to be created
 		// in the host document and then appended to the new window.
-		var head = '<title>'+title+'</title>';
+		var head = '<title>'+exportInfo.title+'</title>';
 		$('style, link').each( function () {
 			head += _styleToAbs( this );
 		} );
@@ -147,14 +142,10 @@ DataTable.ext.buttons.print = {
 
 		// Inject the table and other surrounding information
 		win.document.body.innerHTML =
-			'<h1>'+title+'</h1>'+
-			'<div>'+
-				(typeof config.message === 'function' ?
-					config.message( dt, button, config ) :
-					config.message
-				)+
-			'</div>'+
-			html;
+			'<h1>'+exportInfo.title+'</h1>'+
+			'<div>'+(exportInfo.messageTop || '')+'</div>'+
+			html+
+			'<div>'+(exportInfo.messageBottom || '')+'</div>';
 
 		$(win.document.body).addClass('dt-print-view');
 
@@ -166,17 +157,20 @@ DataTable.ext.buttons.print = {
 			config.customize( win );
 		}
 
+		// Allow stylesheets time to load
 		setTimeout( function () {
 			if ( config.autoPrint ) {
 				win.print(); // blocking - so close will not
 				win.close(); // execute until this is done
 			}
-		}, 250 );
+		}, 1000 );
 	},
 
 	title: '*',
 
-	message: '',
+	messageTop: '*',
+
+	messageBottom: '*',
 
 	exportOptions: {},
 

data/app/assets/javascripts/datatables/extensions/Buttons/dataTables.buttons.js

@@ -1,5 +1,5 @@
-/*! Buttons for DataTables 1.3.1
- * ©2016 SpryMedia Ltd - datatables.net/license
+/*! Buttons for DataTables 1.4.2
+ * ©2016-2017 SpryMedia Ltd - datatables.net/license
  */
 
 (function( factory ){
@@ -433,6 +433,7 @@ $.extend( Buttons.prototype, {
 
 		for ( var i=0, ien=buttons.length ; i<ien ; i++ ) {
 			container.append( buttons[i].inserter );
+			container.append( ' ' );
 
 			if ( buttons[i].buttons && buttons[i].buttons.length ) {
 				this._draw( buttons[i].collection, buttons[i].buttons );
@@ -1142,7 +1143,7 @@ Buttons.defaults = {
  * @type {string}
  * @static
  */
-Buttons.version = '1.3.1';
+Buttons.version = '1.4.2';
 
 
 $.extend( _dtButtons, {
@@ -1183,6 +1184,21 @@ $.extend( _dtButtons, {
 					left: hostOffset.left
 				} );
 
+				// calculate overflow when positioned beneath
+				var tableBottom = tableContainer.offset().top + tableContainer.height();
+				var listBottom = hostOffset.top + host.outerHeight() + config._collection.outerHeight();
+				var bottomOverflow = listBottom - tableBottom;
+				
+				// calculate overflow when positioned above
+				var listTop = hostOffset.top - config._collection.outerHeight();
+				var tableTop = tableContainer.offset().top;
+				var topOverflow = tableTop - listTop;
+				
+				// if bottom overflow is larger, move to the top because it fits better
+				if (bottomOverflow > topOverflow) {
+					config._collection.css( 'top', hostOffset.top - config._collection.outerHeight() - 5);
+				}
+
 				var listRight = hostOffset.left + config._collection.outerWidth();
 				var tableRight = tableContainer.offset().left + tableContainer.width();
 				if ( listRight > tableRight ) {
@@ -1559,6 +1575,118 @@ DataTable.Api.register( 'buttons.exportData()', function ( options ) {
 	}
 } );
 
+// Get information about the export that is common to many of the export data
+// types (DRY)
+DataTable.Api.register( 'buttons.exportInfo()', function ( conf ) {
+	if ( ! conf ) {
+		conf = {};
+	}
+
+	return {
+		filename: _filename( conf ),
+		title: _title( conf ),
+		messageTop: _message(this, conf.messageTop || conf.message, 'top'),
+		messageBottom: _message(this, conf.messageBottom, 'bottom')
+	};
+} );
+
+
+
+/**
+ * Get the file name for an exported file.
+ *
+ * @param {object}	config Button configuration
+ * @param {boolean} incExtension Include the file name extension
+ */
+var _filename = function ( config )
+{
+	// Backwards compatibility
+	var filename = config.filename === '*' && config.title !== '*' && config.title !== undefined ?
+		config.title :
+		config.filename;
+
+	if ( typeof filename === 'function' ) {
+		filename = filename();
+	}
+
+	if ( filename === undefined || filename === null ) {
+		return null;
+	}
+
+	if ( filename.indexOf( '*' ) !== -1 ) {
+		filename = $.trim( filename.replace( '*', $('title').text() ) );
+	}
+
+	// Strip characters which the OS will object to
+	filename = filename.replace(/[^a-zA-Z0-9_\u00A1-\uFFFF\.,\-_ !\(\)]/g, "");
+
+	var extension = _stringOrFunction( config.extension );
+	if ( ! extension ) {
+		extension = '';
+	}
+
+	return filename + extension;
+};
+
+/**
+ * Simply utility method to allow parameters to be given as a function
+ *
+ * @param {undefined|string|function} option Option
+ * @return {null|string} Resolved value
+ */
+var _stringOrFunction = function ( option )
+{
+	if ( option === null || option === undefined ) {
+		return null;
+	}
+	else if ( typeof option === 'function' ) {
+		return option();
+	}
+	return option;
+};
+
+/**
+ * Get the title for an exported file.
+ *
+ * @param {object} config	Button configuration
+ */
+var _title = function ( config )
+{
+	var title = _stringOrFunction( config.title );
+
+	return title === null ?
+		null : title.indexOf( '*' ) !== -1 ?
+			title.replace( '*', $('title').text() || 'Exported data' ) :
+			title;
+};
+
+var _message = function ( dt, option, position )
+{
+	var message = _stringOrFunction( option );
+	if ( message === null ) {
+		return null;
+	}
+
+	var caption = $('caption', dt.table().container()).eq(0);
+	if ( message === '*' ) {
+		var side = caption.css( 'caption-side' );
+		if ( side !== position ) {
+			return null;
+		}
+
+		return caption.length ?
+			caption.text() :
+			'';
+	}
+
+	return message;
+};
+
+
+
+
+
+
 
 var _exportTextarea = $('<textarea/>')[0];
 var _exportData = function ( dt, inOpts )