jquery-datatables 1.10.12 → 1.10.13

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

@@ -126,19 +126,25 @@ DataTable.ext.buttons.print = {
 			head += _relToAbs( this );
 		} );
 
-		//$(win.document.head).html( head );
-		win.document.head.innerHTML = head; // Work around for Edge
+		try {
+			win.document.head.innerHTML = head; // Work around for Edge
+		}
+		catch (e) {
+			$(win.document.head).html( head ); // Old IE
+		}
 
 		// Inject the table and other surrounding information
 		win.document.body.innerHTML =
 			'<h1>'+title+'</h1>'+
-			'<div>'+config.message+'</div>'+
+			'<div>'+
+				(typeof config.message === 'function' ?
+					config.message( dt, button, config ) :
+					config.message
+				)+
+			'</div>'+
 			html;
-		// $(win.document.body).html(
-		// 	'<h1>'+title+'</h1>'+
-		// 	'<div>'+config.message+'</div>'+
-		// 	html
-		// );
+
+		$(win.document.body).addClass('dt-print-view');
 
 		if ( config.customize ) {
 			config.customize( win );

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

@@ -1,4 +1,4 @@
-/*! Buttons for DataTables 1.2.0
+/*! Buttons for DataTables 1.2.3
  * ©2016 SpryMedia Ltd - datatables.net/license
  */
 
@@ -191,8 +191,8 @@ $.extend( Buttons.prototype, {
 		$('body').off( 'keyup.'+this.s.namespace );
 
 		// Individual button destroy (so they can remove their own events if
-		// needed
-		var buttons = this.s.buttons;
+		// needed). Take a copy as the array is modified by `remove`
+		var buttons = this.s.buttons.slice();
 		var i, ien;
 		
 		for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
@@ -879,7 +879,9 @@ Buttons.background = function ( show, className, fade ) {
 	else {
 		$('body > div.'+className)
 			.fadeOut( fade, function () {
-				$(this).remove();
+				$(this)
+					.removeClass( className )
+					.remove();
 			} );
 	}
 };
@@ -1116,7 +1118,7 @@ Buttons.defaults = {
  * @type {string}
  * @static
  */
-Buttons.version = '1.2.0';
+Buttons.version = '1.2.3';
 
 
 $.extend( _dtButtons, {
@@ -1133,7 +1135,7 @@ $.extend( _dtButtons, {
 
 			// Remove any old collection
 			if ( $('div.dt-button-background').length ) {
-				multiLevel = $('div.dt-button-collection').offset();
+				multiLevel = $('.dt-button-collection').offset();
 				$('body').trigger( 'click.dtb-collection' );
 			}
 
@@ -1147,8 +1149,8 @@ $.extend( _dtButtons, {
 
 			if ( multiLevel && position === 'absolute' ) {
 				config._collection.css( {
-					top: multiLevel.top + 5, // magic numbers for a little offset
-					left: multiLevel.left + 5
+					top: multiLevel.top,
+					left: multiLevel.left
 				} );
 			}
 			else if ( position === 'absolute' ) {
@@ -1187,7 +1189,10 @@ $.extend( _dtButtons, {
 				$('div.dt-button-background').on( 'click.dtb-collection', function () {} );
 
 				$('body').on( 'click.dtb-collection', function (e) {
-					if ( ! $(e.target).parents().andSelf().filter( config._collection ).length ) {
+					// andSelf is deprecated in jQ1.8, but we want 1.7 compat
+					var back = $.fn.addBack ? 'addBack' : 'andSelf';
+
+					if ( ! $(e.target).parents()[back]().filter( config._collection ).length ) {
 						config._collection
 							.fadeOut( config.fade, function () {
 								config._collection.detach();
@@ -1268,6 +1273,7 @@ $.extend( _dtButtons, {
 			buttons: $.map( vals, function ( val, i ) {
 				return {
 					text: lang[i],
+					className: 'button-page-length',
 					action: function ( e, dt ) {
 						dt.page.len( val ).draw();
 					},
@@ -1314,7 +1320,9 @@ DataTable.Api.register( 'buttons()', function ( group, selector ) {
 		group = undefined;
 	}
 
-	return this.iterator( true, 'table', function ( ctx ) {
+	this.selector.buttonGroup = group;
+
+	var res = this.iterator( true, 'table', function ( ctx ) {
 		if ( ctx._buttons ) {
 			return Buttons.buttonSelector(
 				Buttons.instanceSelector( group, ctx._buttons ),
@@ -1322,6 +1330,9 @@ DataTable.Api.register( 'buttons()', function ( group, selector ) {
 			);
 		}
 	}, true );
+
+	res._groupSelector = group;
+	return res;
 } );
 
 // Individual button selector
@@ -1408,25 +1419,40 @@ DataTable.Api.registerPlural( 'buttons().trigger()', 'button().trigger()', funct
 	} );
 } );
 
-// Get the container elements for the button sets selected
+// Get the container elements
 DataTable.Api.registerPlural( 'buttons().containers()', 'buttons().container()', function () {
 	var jq = $();
+	var groupSelector = this._groupSelector;
 
-	// jQuery will automatically reduce duplicates to a single entry
-	$( this.each( function ( set ) {
-		jq = jq.add( set.inst.container() );
-	} ) );
+	// We need to use the group selector directly, since if there are no buttons
+	// the result set will be empty
+	this.iterator( true, 'table', function ( ctx ) {
+		if ( ctx._buttons ) {
+			var insts = Buttons.instanceSelector( groupSelector, ctx._buttons );
+
+			for ( var i=0, ien=insts.length ; i<ien ; i++ ) {
+				jq = jq.add( insts[i].container() );
+			}
+		}
+	} );
 
 	return jq;
 } );
 
 // Add a new button
 DataTable.Api.register( 'button().add()', function ( idx, conf ) {
-	if ( this.length === 1 ) {
-		this[0].inst.add( conf, idx );
+	var ctx = this.context;
+
+	// Don't use `this` as it could be empty - select the instances directly
+	if ( ctx.length ) {
+		var inst = Buttons.instanceSelector( this._groupSelector, ctx[0]._buttons );
+
+		if ( inst.length ) {
+			inst[0].add( conf, idx );
+		}
 	}
 
-	return this.button( idx );
+	return this.button( this._groupSelector, idx );
 } );
 
 // Destroy the button sets selected
@@ -1552,21 +1578,25 @@ var _exportData = function ( dt, inOpts )
 
 
 	var header = dt.columns( config.columns ).indexes().map( function (idx) {
-		return config.format.header( dt.column( idx ).header().innerHTML, idx );
+		var el = dt.column( idx ).header();
+		return config.format.header( el.innerHTML, idx, el );
 	} ).toArray();
 
 	var footer = dt.table().footer() ?
 		dt.columns( config.columns ).indexes().map( function (idx) {
 			var el = dt.column( idx ).footer();
-			return config.format.footer( el ? el.innerHTML : '', idx );
+			return config.format.footer( el ? el.innerHTML : '', idx, el );
 		} ).toArray() :
 		null;
 
-	var rowIndexes = dt.rows( config.rows, config.modifier ).indexes().toArray();
-	var cells = dt
-		.cells( rowIndexes, config.columns )
+	var selectedCells = dt.cells( config.rows, config.columns, config.modifier );
+	var cells = selectedCells
 		.render( config.orthogonal )
 		.toArray();
+	var cellNodes = selectedCells
+		.nodes()
+		.toArray();
+
 	var columns = header.length;
 	var rows = columns > 0 ? cells.length / columns : 0;
 	var body = new Array( rows );
@@ -1576,7 +1606,7 @@ var _exportData = function ( dt, inOpts )
 		var row = new Array( columns );
 
 		for ( var j=0 ; j<columns ; j++ ) {
-			row[j] = config.format.body( cells[ cellCounter ], j, i );
+			row[j] = config.format.body( cells[ cellCounter ], i, j, cellNodes[ cellCounter ] );
 			cellCounter++;
 		}
 

data/app/assets/javascripts/datatables/extensions/KeyTable/dataTables.keyTable.js

@@ -1,11 +1,11 @@
-/*! KeyTable 2.1.2
+/*! KeyTable 2.2.0
  * ©2009-2016 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     KeyTable
  * @description Spreadsheet like keyboard navigation for DataTables
- * @version     2.1.2
+ * @version     2.2.0
  * @file        dataTables.keyTable.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -72,7 +72,15 @@ var KeyTable = function ( dt, opts ) {
 		enable: true,
 
 		/** @type {bool} Flag for if a draw is triggered by focus */
-		focusDraw: false
+		focusDraw: false,
+
+		/** @type {bool} Flag to indicate when waiting for a draw to happen.
+		  *   Will ignore key presses at this point
+		  */
+		waitingForDraw: false,
+
+		/** @type {object} Information about the last cell that was focused */
+		lastFocus: null
 	};
 
 	// DOM items
@@ -96,7 +104,7 @@ $.extend( KeyTable.prototype, {
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * API methods for DataTables API interface
 	 */
-	
+
 	/**
 	 * Blur the table's cell focus
 	 */
@@ -138,7 +146,7 @@ $.extend( KeyTable.prototype, {
 			return false;
 		}
 
-		var lastIdx = this.s.lastFocus.index();
+		var lastIdx = this.s.lastFocus.cell.index();
 		return cell.row === lastIdx.row && cell.column === lastIdx.column;
 	},
 
@@ -166,7 +174,7 @@ $.extend( KeyTable.prototype, {
 		}
 
 		// Click to focus
-		$( dt.table().body() ).on( 'click.keyTable', 'th, td', function () {
+		$( dt.table().body() ).on( 'click.keyTable', 'th, td', function (e) {
 			if ( that.s.enable === false ) {
 				return;
 			}
@@ -177,7 +185,7 @@ $.extend( KeyTable.prototype, {
 				return;
 			}
 
-			that._focus( cell, null, false );
+			that._focus( cell, null, false, e );
 		} );
 
 		// Key events
@@ -187,7 +195,7 @@ $.extend( KeyTable.prototype, {
 
 		// Click blur
 		if ( this.c.blurable ) {
-			$( document ).on( 'click.keyTable', function ( e ) {
+			$( document ).on( 'mousedown.keyTable', function ( e ) {
 				// Click on the search input will blur focus
 				if ( $(e.target).parents( '.dataTables_filter' ).length ) {
 					that._blur();
@@ -203,6 +211,11 @@ $.extend( KeyTable.prototype, {
 					return;
 				}
 
+				//If the click was inside the fixed columns container, don't blur
+				if ( $(e.target).parents().filter('.DTFC_Cloned').length ) {
+					return;
+				}
+
 				that._blur();
 			} );
 		}
@@ -217,29 +230,30 @@ $.extend( KeyTable.prototype, {
 		if ( dt.settings()[0].oFeatures.bStateSave ) {
 			dt.on( 'stateSaveParams.keyTable', function (e, s, d) {
 				d.keyTable = that.s.lastFocus ?
-					that.s.lastFocus.index() :
+					that.s.lastFocus.cell.index() :
 					null;
 			} );
 		}
 
-		// Reload - re-focus on the currently selected item. In SSP mode this
-		// has the effect of keeping the focus in position when changing page as
-		// well (which is different from how client-side processing works).
-		dt.on( 'xhr.keyTable', function ( e ) {
+		// Redraw - retain focus on the current cell
+		dt.on( 'draw.keyTable', function (e) {
 			if ( that.s.focusDraw ) {
-				// Triggered by server-side processing, and thus `_focus` will
-				// do the refocus on the next draw event
 				return;
 			}
 
 			var lastFocus = that.s.lastFocus;
 
 			if ( lastFocus ) {
-				that.s.lastFocus = null;
+				var relative = that.s.lastFocus.relative;
+				var info = dt.page.info();
+				var row = relative.row + info.start;
 
-				dt.one( 'draw', function () {
-					that._focus( lastFocus );
-				} );
+				// Reverse if needed
+				if ( row >= info.recordsDisplay ) {
+					row = info.recordsDisplay - 1;
+				}
+
+				that._focus( row, relative.column, true, e );
 			}
 		} );
 
@@ -288,11 +302,13 @@ $.extend( KeyTable.prototype, {
 			return;
 		}
 
-		var cell = this.s.lastFocus;
+		var cell = this.s.lastFocus.cell;
 
 		$( cell.node() ).removeClass( this.c.className );
 		this.s.lastFocus = null;
 
+		this._updateFixedColumns(cell.index().column);
+
 		this._emitEvent( 'key-blur', [ this.s.dt, cell ] );
 	},
 
@@ -332,6 +348,11 @@ $.extend( KeyTable.prototype, {
 		var dt = this.s.dt;
 		var editor = this.c.editor;
 
+		// Don't activate inline editing when the shift key is pressed
+		if ( key === 16 ) {
+			return;
+		}
+
 		orig.stopPropagation();
 
 		// Return key should do nothing - for textareas's it would empty the
@@ -340,16 +361,13 @@ $.extend( KeyTable.prototype, {
 			orig.preventDefault();
 		}
 
-		editor.inline( this.s.lastFocus.index() );
+		editor.inline( this.s.lastFocus.cell.index() );
 
 		// Excel style - select all text
-		var input = $('div.DTE input, div.DTE textarea');
-		if ( input.length ) {
-			input[0].select();
-		}
+		$('div.DTE input, div.DTE textarea').select();
 
 		// Reduce the keys the Keys listens for
-		dt.keys.enable( 'navigation-only' );
+		dt.keys.enable( this.c.editorKeys );
 
 		// On blur of the navigation submit
 		dt.one( 'key-blur.editor', function () {
@@ -386,19 +404,21 @@ $.extend( KeyTable.prototype, {
 	 *
 	 * @param  {DataTables.Api|integer} row Can be given as an API instance that
 	 *   contains the cell to focus or as an integer. As the latter it is the
-	 *   visible row index - NOT the data index
+	 *   visible row index (from the whole data set) - NOT the data index
 	 * @param  {integer} [column] Not required if a cell is given as the first
 	 *   parameter. Otherwise this is the column data index for the cell to
 	 *   focus on
 	 * @param {boolean} [shift=true] Should the viewport be moved to show cell
 	 * @private
 	 */
-	_focus: function ( row, column, shift )
+	_focus: function ( row, column, shift, originalEvent )
 	{
 		var that = this;
 		var dt = this.s.dt;
 		var pageInfo = dt.page.info();
 		var lastFocus = this.s.lastFocus;
+		if( ! originalEvent)
+			originalEvent = null;
 
 		if ( ! this.s.enable ) {
 			return;
@@ -425,10 +445,12 @@ $.extend( KeyTable.prototype, {
 		// page
 		if ( pageInfo.length !== -1 && (row < pageInfo.start || row >= pageInfo.start+pageInfo.length) ) {
 			this.s.focusDraw = true;
+			this.s.waitingForDraw = true;
 
 			dt
 				.one( 'draw', function () {
 					that.s.focusDraw = false;
+					that.s.waitingForDraw = false;
 					that._focus( row, column );
 				} )
 				.page( Math.floor( row / pageInfo.length ) )
@@ -452,7 +474,7 @@ $.extend( KeyTable.prototype, {
 
 		if ( lastFocus ) {
 			// Don't trigger a refocus on the same cell
-			if ( lastFocus.node() === cell.node() ) {
+			if ( lastFocus.node === cell.node() ) {
 				return;
 			}
 
@@ -463,6 +485,8 @@ $.extend( KeyTable.prototype, {
 		var node = $( cell.node() );
 		node.addClass( this.c.className );
 
+		this._updateFixedColumns(column);
+
 		// Shift viewpoint and page to make cell visible
 		if ( shift === undefined || shift === true ) {
 			this._scroll( $(window), $(document.body), node, 'offset' );
@@ -476,9 +500,16 @@ $.extend( KeyTable.prototype, {
 		}
 
 		// Event and finish
-		this.s.lastFocus = cell;
+		this.s.lastFocus = {
+			cell: cell,
+			node: cell.node(),
+			relative: {
+				row: dt.rows( { page: 'current' } ).indexes().indexOf( cell.index().row ),
+				column: cell.index().column
+			}
+		};
 
-		this._emitEvent( 'key-focus', [ this.s.dt, cell ] );
+		this._emitEvent( 'key-focus', [ this.s.dt, cell, originalEvent || null ] );
 		dt.state.save();
 	},
 
@@ -491,7 +522,16 @@ $.extend( KeyTable.prototype, {
 	 */
 	_key: function ( e )
 	{
-		if ( ! this.s.enable ) {
+		// If we are waiting for a draw to happen from another key event, then
+		// do nothing for this new key press.
+		if ( this.s.waitingForDraw ) {
+			e.preventDefault();
+			return;
+		}
+
+		var enable = this.s.enable;
+		var navEnable = enable === true || enable === 'navigation-only';
+		if ( ! enable ) {
 			return;
 		}
 
@@ -500,8 +540,8 @@ $.extend( KeyTable.prototype, {
 		}
 
 		// If not focused, then there is no key action to take
-		var cell = this.s.lastFocus;
-		if ( ! cell ) {
+		var lastFocus = this.s.lastFocus;
+		if ( ! lastFocus ) {
 			return;
 		}
 
@@ -515,63 +555,68 @@ $.extend( KeyTable.prototype, {
 
 		switch( e.keyCode ) {
 			case 9: // tab
+				// `enable` can be tab-only
 				this._shift( e, e.shiftKey ? 'left' : 'right', true );
 				break;
 
 			case 27: // esc
-				if ( this.s.blurable && this.s.enable === true ) {
+				if ( this.s.blurable && enable === true ) {
 					this._blur();
 				}
 				break;
 
 			case 33: // page up (previous page)
 			case 34: // page down (next page)
-				e.preventDefault();
-				var index = dt.cells( {page: 'current'} ).nodes().indexOf( cell.node() );
-
-				dt
-					.one( 'draw', function () {
-						var nodes = dt.cells( {page: 'current'} ).nodes();
-
-						that._focus( dt.cell( index < nodes.length ?
-							nodes[ index ] :
-							nodes[ nodes.length-1 ]
-						) );
-					} )
-					.page( e.keyCode === 33 ? 'previous' : 'next' )
-					.draw( false );
+				if ( navEnable ) {
+					e.preventDefault();
+
+					dt
+						.page( e.keyCode === 33 ? 'previous' : 'next' )
+						.draw( false );
+				}
 				break;
 
 			case 35: // end (end of current page)
 			case 36: // home (start of current page)
-				e.preventDefault();
-				var indexes = dt.cells( {page: 'current'} ).indexes();
-
-				this._focus( dt.cell(
-					indexes[ e.keyCode === 35 ? indexes.length-1 : 0 ]
-				) );
+				if ( navEnable ) {
+					e.preventDefault();
+					var indexes = dt.cells( {page: 'current'} ).indexes();
+					var colIndexes = this._columns();
+
+					this._focus( dt.cell(
+						indexes[ e.keyCode === 35 ? indexes.length-1 : colIndexes[0] ]
+					), null, true, e );
+				}
 				break;
 
 			case 37: // left arrow
-				this._shift( e, 'left' );
+				if ( navEnable ) {
+					this._shift( e, 'left' );
+				}
 				break;
 
 			case 38: // up arrow
-				this._shift( e, 'up' );
+				if ( navEnable ) {
+					this._shift( e, 'up' );
+				}
 				break;
 
 			case 39: // right arrow
-				this._shift( e, 'right' );
+				if ( navEnable ) {
+					this._shift( e, 'right' );
+				}
 				break;
 
 			case 40: // down arrow
-				this._shift( e, 'down' );
+				if ( navEnable ) {
+					this._shift( e, 'down' );
+				}
 				break;
 
 			default:
 				// Everything else - pass through only when fully enabled
-				if ( this.s.enable === true ) {
-					this._emitEvent( 'key', [ dt, e.keyCode, this.s.lastFocus, e ] );
+				if ( enable === true ) {
+					this._emitEvent( 'key', [ dt, e.keyCode, this.s.lastFocus.cell, e ] );
 				}
 				break;
 		}
@@ -639,7 +684,7 @@ $.extend( KeyTable.prototype, {
 		var dt           = this.s.dt;
 		var pageInfo     = dt.page.info();
 		var rows         = pageInfo.recordsDisplay;
-		var currentCell  = this.s.lastFocus;
+		var currentCell  = this.s.lastFocus.cell;
 		var columns      = this._columns();
 
 		if ( ! currentCell ) {
@@ -696,7 +741,7 @@ $.extend( KeyTable.prototype, {
 		) {
 			e.preventDefault();
 
-			this._focus( row, column );
+			this._focus( row, column, true, e );
 		}
 		else if ( ! keyBlurable || ! this.c.blurable ) {
 			// No new focus, but if the table isn't blurable, then don't loose
@@ -736,10 +781,27 @@ $.extend( KeyTable.prototype, {
 			} )
 			.insertBefore( dt.table().node() );
 
-		div.children().on( 'focus', function () {
-			that._focus( dt.cell(':eq(0)', '0:visible', {page: 'current'}) );
+		div.children().on( 'focus', function (e) {
+			that._focus( dt.cell(':eq(0)', '0:visible', {page: 'current'}), null, true, e );
 		} );
-	}
+	},
+	/**
+	 * Update fixed columns if they are enabled and if the cell we are focusing is inside a  fixed column
+	 * @param  {integer}  column           Index of the column being changed
+	 *
+	 * @private
+	 */
+	 _updateFixedColumns:function(column){
+	 	var dt = this.s.dt;
+	 	var settings = dt.settings()[0];
+
+	 	if(settings._oFixedColumns){
+	 		var leftCols = settings._oFixedColumns.s.iLeftColumns;
+	 		var rightCols = settings.aoColumns.length - settings._oFixedColumns.s.iRightColumns;
+	 		if (column < leftCols || column > rightCols)
+	 			dt.fixedColumns().update();
+	 	}
+	 }
 } );
 
 
@@ -776,6 +838,13 @@ KeyTable.defaults = {
 	 */
 	editor: null,
 
+	/**
+	 * Option that defines what KeyTable's behaviour will be when used with
+	 * Editor's inline editing. Can be `navigation-only` or `tab-only`.
+	 * @type {String}
+	 */
+	editorKeys: 'navigation-only',
+
 	/**
 	 * Select a cell to automatically select on start up. `null` for no
 	 * automatic selection
@@ -798,7 +867,7 @@ KeyTable.defaults = {
 
 
 
-KeyTable.version = "2.1.2";
+KeyTable.version = "2.2.0";
 
 
 $.fn.dataTable.KeyTable = KeyTable;
@@ -870,7 +939,7 @@ $(document).on( 'preInit.dt.dtk', function (e, settings, json) {
 	var defaults = DataTable.defaults.keys;
 
 	if ( init || defaults ) {
-		var opts = $.extend( {}, init, defaults );
+		var opts = $.extend( {}, defaults, init );
 
 		if ( init !== false ) {
 			new KeyTable( settings, opts  );