jquery-datatables 1.10.15 → 1.10.16

data/app/assets/javascripts/datatables/extensions/Responsive/responsive.bootstrap4.js

@@ -65,7 +65,7 @@ _display.modal = function ( options ) {
 					header
 						.empty()
 						.append( '<h4 class="modal-title">'+options.header( row )+'</h4>' )
-						.prepend( button );
+						.append( button );
 				}
 
 				_modal.find( 'div.modal-body' )

data/app/assets/javascripts/datatables/extensions/RowGroup/dataTables.rowGroup.js

@@ -1,11 +1,11 @@
-/*! RowGroup 1.0.0
+/*! RowGroup 1.0.2
  * ©2017 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     RowGroup
  * @description RowGrouping for DataTables
- * @version     1.0.0
+ * @version     1.0.2
  * @file        dataTables.rowGroup.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     datatables.net
@@ -68,7 +68,7 @@ var RowGroup = function ( dt, opts ) {
 	this.s = {
 		dt: new DataTable.Api( dt ),
 
-		dataFn: DataTable.ext.oApi._fnGetObjectDataFn( this.c.dataSrc ),
+		dataFn: DataTable.ext.oApi._fnGetObjectDataFn( this.c.dataSrc )
 	};
 
 	// DOM items
@@ -153,7 +153,7 @@ $.extend( RowGroup.prototype, {
 			}
 		} );
 
-		dt.on( 'column-visibility.dtrg', function () {
+		dt.on( 'column-visibility.dt.dtrg responsive-resize.dt.dtrg', function () {
 			that._adjustColspan();
 		} );
 
@@ -183,7 +183,9 @@ $.extend( RowGroup.prototype, {
 	 */
 	_colspan: function ()
 	{
-		return $( this.s.dt.columns().header() ).filter(':visible').length;
+		return this.s.dt.columns().visible().reduce( function (a, b) {
+			return a + b;
+		}, 0 );
 	},
 
 	/**
@@ -321,7 +323,7 @@ RowGroup.defaults = {
 };
 
 
-RowGroup.version = "1.0.0";
+RowGroup.version = "1.0.2";
 
 
 $.fn.dataTable.RowGroup = RowGroup;

data/app/assets/javascripts/datatables/extensions/RowReorder/dataTables.rowReorder.js

@@ -1,15 +1,15 @@
-/*! RowReorder 1.2.0
- * 2015-2016 SpryMedia Ltd - datatables.net/license
+/*! RowReorder 1.2.3
+ * 2015-2017 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     RowReorder
  * @description Row reordering extension for DataTables
- * @version     1.2.0
+ * @version     1.2.3
  * @file        dataTables.rowReorder.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
- * @copyright   Copyright 2015-2016 SpryMedia Ltd.
+ * @copyright   Copyright 2015-2017 SpryMedia Ltd.
  *
  * This source file is free software, available under the following license:
  *   MIT license - http://datatables.net/license/mit
@@ -118,7 +118,13 @@ var RowReorder = function ( dt, opts ) {
 		},
 
 		/** @type {integer} Window height cached value */
-		windowHeight: 0
+		windowHeight: 0,
+
+		/** @type {integer} Document outer height cached value */
+		documentOuterHeight: 0,
+
+		/** @type {integer} DOM clone outer height cached value */
+		domCloneOuterHeight: 0
 	};
 
 	// DOM items
@@ -170,14 +176,20 @@ $.extend( RowReorder.prototype, {
 		// Use `table().container()` rather than just the table node for IE8 -
 		// otherwise it only works once...
 		$(dt.table().container()).on( 'mousedown.rowReorder touchstart.rowReorder', this.c.selector, function (e) {
-			if ( ! that.c.enabled ) {
+			if ( ! that.c.enable ) {
 				return;
 			}
 
 			var tr = $(this).closest('tr');
+			var row = dt.row( tr );
 
 			// Double check that it is a DataTable row
-			if ( dt.row( tr ).any() ) {
+			if ( row.any() ) {
+				that._emitEvent( 'pre-row-reorder', {
+					node: row.node(),
+					index: row.index()
+				} );
+
 				that._mouseDown( e, tr );
 				return false;
 			}
@@ -226,6 +238,7 @@ $.extend( RowReorder.prototype, {
 		this.s.middles = middles;
 		this.s.bodyTop = $( dt.table().body() ).offset().top;
 		this.s.windowHeight = $(window).height();
+		this.s.documentOuterHeight = $(document).outerHeight();
 	},
 
 
@@ -262,6 +275,7 @@ $.extend( RowReorder.prototype, {
 		clone.appendTo( 'body' );
 
 		this.dom.clone = clone;
+		this.s.domCloneOuterHeight = clone.outerHeight();
 	},
 
 
@@ -278,6 +292,7 @@ $.extend( RowReorder.prototype, {
 		var leftDiff = this._eventToPage( e, 'X' ) - start.left;
 		var snap = this.c.snapX;
 		var left;
+		var top = topDiff + start.offsetTop;
 
 		if ( snap === true ) {
 			left = start.offsetLeft;
@@ -289,8 +304,15 @@ $.extend( RowReorder.prototype, {
 			left = leftDiff + start.offsetLeft;
 		}
 
+		if(top < 0) {
+			top = 0
+		}
+		else if(top + this.s.domCloneOuterHeight > this.s.documentOuterHeight) {
+			top = this.s.documentOuterHeight - this.s.domCloneOuterHeight;
+		}
+
 		this.dom.clone.css( {
-			top: topDiff + start.offsetTop,
+			top: top,
 			left: left
 		} );
 	},
@@ -510,10 +532,33 @@ $.extend( RowReorder.prototype, {
 		// Emit event
 		this._emitEvent( 'row-reorder', eventArgs );
 
+		var update = function () {
+			if ( that.c.update ) {
+				for ( i=0, ien=fullDiff.length ; i<ien ; i++ ) {
+					var row = dt.row( fullDiff[i].node );
+					var rowData = row.data();
+
+					setDataFn( rowData, fullDiff[i].newData );
+
+					// Invalidate the cell that has the same data source as the dataSrc
+					dt.columns().every( function () {
+						if ( this.dataSrc() === dataSrc ) {
+							dt.cell( fullDiff[i].node, this.index() ).invalidate( 'data' );
+						}
+					} );
+				}
+
+				// Trigger row reordered event
+				that._emitEvent( 'row-reordered', eventArgs );
+
+				dt.draw( false );
+			}
+		};
+
 		// Editor interface
 		if ( this.c.editor ) {
 			// Disable user interaction while Editor is submitting
-			this.c.enabled = false;
+			this.c.enable = false;
 
 			this.c.editor
 				.edit(
@@ -522,32 +567,20 @@ $.extend( RowReorder.prototype, {
 					$.extend( {submit: 'changed'}, this.c.formOptions )
 				)
 				.multiSet( dataSrc, idDiff )
+				.one( 'submitUnsuccessful.rowReorder', function () {
+					dt.draw( false );
+				} )
+				.one( 'submitSuccess.rowReorder', function () {
+					update();
+				} )
 				.one( 'submitComplete', function () {
-					that.c.enabled = true;
+					that.c.enable = true;
+					that.c.editor.off( '.rowReorder' );
 				} )
 				.submit();
 		}
-
-		// Do update if required
-		if ( this.c.update ) {
-			for ( i=0, ien=fullDiff.length ; i<ien ; i++ ) {
-				var row = dt.row( fullDiff[i].node );
-				var rowData = row.data();
-
-				setDataFn( rowData, fullDiff[i].newData );
-
-				// Invalidate the cell that has the same data source as the dataSrc
-				dt.columns().every( function () {
-					if ( this.dataSrc() === dataSrc ) {
-						dt.cell( fullDiff[i].node, this.index() ).invalidate( 'data' );
-					}
-				} );
-			}
-			
-			// Trigger row reordered event
-			this._emitEvent( 'row-reordered', eventArgs );
-
-			dt.draw( false );
+		else {
+			update();
 		}
 	},
 
@@ -664,7 +697,7 @@ RowReorder.defaults = {
 	 * Enable / disable RowReorder's user interaction
 	 * @type {Boolean}
 	 */
-	enabled: true,
+	enable: true,
 
 	/**
 	 * Form options to pass to Editor when submitting a change in the row order.
@@ -717,7 +750,7 @@ Api.register( 'rowReorder.enable()', function ( toggle ) {
 
 	return this.iterator( 'table', function ( ctx ) {
 		if ( ctx.rowreorder ) {
-			ctx.rowreorder.c.enabled = toggle;
+			ctx.rowreorder.c.enable = toggle;
 		}
 	} );
 } );
@@ -725,7 +758,7 @@ Api.register( 'rowReorder.enable()', function ( toggle ) {
 Api.register( 'rowReorder.disable()', function () {
 	return this.iterator( 'table', function ( ctx ) {
 		if ( ctx.rowreorder ) {
-			ctx.rowreorder.c.enabled = false;
+			ctx.rowreorder.c.enable = false;
 		}
 	} );
 } );
@@ -737,7 +770,7 @@ Api.register( 'rowReorder.disable()', function () {
  * @name RowReorder.version
  * @static
  */
-RowReorder.version = '1.2.0';
+RowReorder.version = '1.2.3';
 
 
 $.fn.dataTable.RowReorder = RowReorder;

data/app/assets/javascripts/datatables/extensions/Scroller/dataTables.scroller.js

@@ -1,15 +1,15 @@
-/*! Scroller 1.4.2
- * ©2011-2016 SpryMedia Ltd - datatables.net/license
+/*! Scroller 1.4.3
+ * ©2011-2017 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     Scroller
  * @description Virtual rendering for DataTables
- * @version     1.4.2
+ * @version     1.4.3
  * @file        dataTables.scroller.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
- * @copyright   Copyright 2011-2016 SpryMedia Ltd.
+ * @copyright   Copyright 2011-2017 SpryMedia Ltd.
  *
  * This source file is free software, available under the following license:
  *   MIT license - http://datatables.net/license/mit
@@ -210,7 +210,8 @@ var Scroller = function ( dt, opts ) {
 
 		topRowFloat: 0,
 		scrollDrawDiff: null,
-		loaderVisible: false
+		loaderVisible: false,
+		forceReposition: false
 	};
 
 	// @todo The defaults should extend a `c` property and the internal settings
@@ -371,6 +372,14 @@ $.extend( Scroller.prototype, {
 		if ( (px > this.s.redrawBottom || px < this.s.redrawTop) && this.s.dt._iDisplayStart !== drawRow ) {
 			ani = true;
 			px = this.fnRowToPixels( iRow, false, true );
+
+			// If we need records outside the current draw region, but the new
+			// scrolling position is inside that (due to the non-linear nature
+			// for larger numbers of records), we need to force position update.
+			if ( this.s.redrawTop < px && px < this.s.redrawBottom ) {
+				this.s.forceReposition = true;
+				bAnimate = false;
+			}
 		}
 
 		if ( typeof bAnimate == 'undefined' || bAnimate )
@@ -432,7 +441,15 @@ $.extend( Scroller.prototype, {
 		var heights = this.s.heights;
 
 		if ( heights.row ) {
-			heights.viewport = $(this.dom.scroller).height();
+			heights.viewport = $.contains(document, this.dom.scroller) ?
+				$(this.dom.scroller).height() :
+				this._parseHeight($(this.dom.scroller).css('height'));
+
+			// If collapsed (no height) use the max-height parameter
+			if ( ! heights.viewport ) {
+				heights.viewport = this._parseHeight($(this.dom.scroller).css('max-height'));
+			}
+
 			this.s.viewportRows = parseInt( heights.viewport / heights.row, 10 )+1;
 			this.s.dt._iDisplayLength = this.s.viewportRows * this.s.displayBuffer;
 		}
@@ -656,10 +673,11 @@ $.extend( Scroller.prototype, {
 		/* Check if the scroll point is outside the trigger boundary which would required
 		 * a DataTables redraw
 		 */
-		if ( iScrollTop < this.s.redrawTop || iScrollTop > this.s.redrawBottom ) {
+		if ( this.s.forceReposition || iScrollTop < this.s.redrawTop || iScrollTop > this.s.redrawBottom ) {
+
 			var preRows = Math.ceil( ((this.s.displayBuffer-1)/2) * this.s.viewportRows );
 
-			if ( Math.abs( iScrollTop - this.s.lastScrollTop ) > heights.viewport || this.s.ani ) {
+			if ( Math.abs( iScrollTop - this.s.lastScrollTop ) > heights.viewport || this.s.ani || this.s.forceReposition ) {
 				iTopRow = parseInt(this._domain( 'physicalToVirtual', iScrollTop ) / heights.row, 10) - preRows;
 				this.s.topRowFloat = this._domain( 'physicalToVirtual', iScrollTop ) / heights.row;
 			}
@@ -668,6 +686,8 @@ $.extend( Scroller.prototype, {
 				this.s.topRowFloat = this.fnPixelsToRow( iScrollTop, false );
 			}
 
+			this.s.forceReposition = false;
+
 			if ( iTopRow <= 0 ) {
 				/* At the start of the table */
 				iTopRow = 0;
@@ -783,6 +803,45 @@ $.extend( Scroller.prototype, {
 		}
 	},
 
+	/**
+	 * Parse CSS height property string as number
+	 *
+	 * An attempt is made to parse the string as a number. Currently supported units are 'px',
+	 * 'vh', and 'rem'. 'em' is partially supported; it works as long as the parent element's
+	 * font size matches the body element. Zero is returned for unrecognized strings.
+	 *  @param {string} cssHeight CSS height property string
+	 *  @returns {number} height
+	 *  @private
+	 */
+	_parseHeight: function(cssHeight) {
+		var height;
+		var matches = /^([+-]?(?:\d+(?:\.\d+)?|\.\d+))(px|em|rem|vh)$/.exec(cssHeight);
+
+		if (matches === null) {
+			return 0;
+		}
+
+		var value = parseFloat(matches[1]);
+		var unit = matches[2];
+
+		if ( unit === 'px' ) {
+			height = value;
+		}
+		else if ( unit === 'vh' ) {
+			height = ( value / 100 ) * $(window).height();
+		}
+		else if ( unit === 'rem' ) {
+			height = value * parseFloat($(':root').css('font-size'));
+		}
+		else if ( unit === 'em' ) {
+			height = value * parseFloat($('body').css('font-size'));
+		}
+
+		return height ?
+			height :
+			0;
+	},
+
 
 	/**
 	 * Draw callback function which is fired when the DataTable is redrawn. The main function of
@@ -850,7 +909,9 @@ $.extend( Scroller.prototype, {
 		// scroll event listener
 		var boundaryPx = (iScrollTop - this.s.tableTop) * this.s.boundaryScale;
 		this.s.redrawTop = iScrollTop - boundaryPx;
-		this.s.redrawBottom = iScrollTop + boundaryPx;
+		this.s.redrawBottom = iScrollTop + boundaryPx > heights.scroll - heights.viewport - heights.row ?
+			heights.scroll - heights.viewport - heights.row :
+			iScrollTop + boundaryPx;
 
 		this.s.skip = false;
 
@@ -1217,7 +1278,7 @@ Scroller.oDefaults = Scroller.defaults;
  *  @name      Scroller.version
  *  @static
  */
-Scroller.version = "1.4.2";
+Scroller.version = "1.4.3";
 
 
 

data/app/assets/javascripts/datatables/extensions/Select/dataTables.select.js

@@ -1,16 +1,16 @@
-/*! Select for DataTables 1.2.2
- * 2015-2016 SpryMedia Ltd - datatables.net/license/mit
+/*! Select for DataTables 1.2.3
+ * 2015-2017 SpryMedia Ltd - datatables.net/license/mit
  */
 
 /**
  * @summary     Select for DataTables
  * @description A collection of API methods, events and buttons for DataTables
  *   that provides selection options of the items in a DataTable
- * @version     1.2.2
+ * @version     1.2.3
  * @file        dataTables.select.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     datatables.net/forums
- * @copyright   Copyright 2015-2016 SpryMedia Ltd.
+ * @copyright   Copyright 2015-2017 SpryMedia Ltd.
  *
  * This source file is free software, available under the following license:
  *   MIT license - http://datatables.net/license/mit
@@ -54,7 +54,7 @@ var DataTable = $.fn.dataTable;
 // Version information for debugger
 DataTable.select = {};
 
-DataTable.select.version = '1.2.2';
+DataTable.select.version = '1.2.3';
 
 DataTable.select.init = function ( dt ) {
 	var ctx = dt.settings()[0];
@@ -401,8 +401,8 @@ function enableMouseSelection ( dt )
 
 			// Ignore elements which have been removed from the DOM (i.e. paging
 			// buttons)
-			if ( e.target.getRootNode() !== document ) {
-				return;
+			if ( $(e.target).parents('html').length === 0 ) {
+			 	return;
 			}
 
 			// Don't blur in Editor form
@@ -455,6 +455,10 @@ function info ( api )
 		return;
 	}
 
+	if ( api.select.style() === 'api' ) {
+		return;
+	}
+
 	var rows    = api.rows( { selected: true } ).flatten().length;
 	var columns = api.columns( { selected: true } ).flatten().length;
 	var cells   = api.cells( { selected: true } ).flatten().length;