jquery-datatables-rails 3.2.0 → 3.3.0

data/app/assets/javascripts/dataTables/extras/dataTables.fixedColumns.js

@@ -1,11 +1,11 @@
-/*! FixedColumns 3.0.2
+/*! FixedColumns 3.0.4
  * ©2010-2014 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     FixedColumns
  * @description Freeze columns in place on a scrolling DataTable
- * @version     3.0.2
+ * @version     3.0.4
  * @file        dataTables.fixedColumns.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -62,7 +62,7 @@ var FixedColumns = function ( dt, init ) {
 	var that = this;
 
 	/* Sanity check - you just know it will happen */
-	if ( ! this instanceof FixedColumns )
+	if ( ! ( this instanceof FixedColumns ) )
 	{
 		alert( "FixedColumns warning: FixedColumns must be initialised with the 'new' keyword." );
 		return;
@@ -75,8 +75,10 @@ var FixedColumns = function ( dt, init ) {
 
 	// Use the DataTables Hungarian notation mapping method, if it exists to
 	// provide forwards compatibility for camel case variables
-	if ( $.fn.dataTable.camelToHungarian ) {
-		$.fn.dataTable.camelToHungarian( FixedColumns.defaults, init );
+	var camelToHungarian = $.fn.dataTable.camelToHungarian;
+	if ( camelToHungarian ) {
+		camelToHungarian( FixedColumns.defaults, FixedColumns.defaults, true );
+		camelToHungarian( FixedColumns.defaults, init );
 	}
 
 	// v1.10 allows the settings object to be got form a number of sources
@@ -746,6 +748,18 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 			iLeftWidth = this.s.iLeftWidth,
 			iRightWidth = this.s.iRightWidth,
 			iRight;
+		var scrollbarAdjust = function ( node, width ) {
+			if ( ! oOverflow.bar ) {
+				// If there is no scrollbar (Macs) we need to hide the auto scrollbar
+				node.style.width = (width+20)+"px";
+				node.style.paddingRight = "20px";
+				node.style.boxSizing = "border-box";
+			}
+			else {
+				// Otherwise just overflow by the scrollbar
+				node.style.width = (width+oOverflow.bar)+"px";
+			}
+		};
 
 		// When x scrolling - don't paint the fixed columns over the x scrollbar
 		if ( oOverflow.x )
@@ -764,7 +778,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				oGrid.left.foot.style.top = (oOverflow.x ? oOverflow.bar : 0)+"px"; // shift footer for scrollbar
 			}
 
-			oGrid.left.liner.style.width = (iLeftWidth+oOverflow.bar)+"px";
+			scrollbarAdjust( oGrid.left.liner, iLeftWidth );
 			oGrid.left.liner.style.height = iBodyHeight+"px";
 		}
 
@@ -784,7 +798,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				oGrid.right.foot.style.top = (oOverflow.x ? oOverflow.bar : 0)+"px";
 			}
 
-			oGrid.right.liner.style.width = (iRightWidth+oOverflow.bar)+"px";
+			scrollbarAdjust( oGrid.right.liner, iRightWidth );
 			oGrid.right.liner.style.height = iBodyHeight+"px";
 
 			oGrid.right.headBlock.style.display = oOverflow.y ? 'block' : 'none';
@@ -970,7 +984,8 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 	{
 		var that = this,
 			i, iLen, j, jLen, jq, nTarget, iColumn, nClone, iIndex, aoCloneLayout,
-			jqCloneThead, aoFixedHeader;
+			jqCloneThead, aoFixedHeader,
+			dt = this.s.dt;
 
 		/*
 		 * Header
@@ -987,7 +1002,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 			oGrid.head.appendChild( oClone.header );
 
 			/* Copy the DataTables layout cache for the header for our floating column */
-			aoCloneLayout = this._fnCopyLayout( this.s.dt.aoHeader, aiColumns );
+			aoCloneLayout = this._fnCopyLayout( dt.aoHeader, aiColumns );
 			jqCloneThead = $('>thead', oClone.header);
 			jqCloneThead.empty();
 
@@ -1000,7 +1015,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 			/* Use the handy _fnDrawHead function in DataTables to do the rowspan/colspan
 			 * calculations for us
 			 */
-			this.s.dt.oApi._fnDrawHead( this.s.dt, aoCloneLayout, true );
+			dt.oApi._fnDrawHead( dt, aoCloneLayout, true );
 		}
 		else
 		{
@@ -1009,10 +1024,10 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 			 * cloned cells, just copy the classes across. To get the matching layout for the
 			 * fixed component, we use the DataTables _fnDetectHeader method, allowing 1:1 mapping
 			 */
-			aoCloneLayout = this._fnCopyLayout( this.s.dt.aoHeader, aiColumns );
+			aoCloneLayout = this._fnCopyLayout( dt.aoHeader, aiColumns );
 			aoFixedHeader=[];
 
-			this.s.dt.oApi._fnDetectHeader( aoFixedHeader, $('>thead', oClone.header)[0] );
+			dt.oApi._fnDetectHeader( aoFixedHeader, $('>thead', oClone.header)[0] );
 
 			for ( i=0, iLen=aoCloneLayout.length ; i<iLen ; i++ )
 			{
@@ -1046,8 +1061,8 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 
 		oClone.body = $(this.dom.body).clone(true)[0];
 		oClone.body.className += " DTFC_Cloned";
-		oClone.body.style.paddingBottom = this.s.dt.oScroll.iBarWidth+"px";
-		oClone.body.style.marginBottom = (this.s.dt.oScroll.iBarWidth*2)+"px"; /* For IE */
+		oClone.body.style.paddingBottom = dt.oScroll.iBarWidth+"px";
+		oClone.body.style.marginBottom = (dt.oScroll.iBarWidth*2)+"px"; /* For IE */
 		if ( oClone.body.getAttribute('id') !== null )
 		{
 			oClone.body.removeAttribute('id');
@@ -1058,7 +1073,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 
 		var nBody = $('tbody', oClone.body)[0];
 		$(nBody).empty();
-		if ( this.s.dt.aiDisplay.length > 0 )
+		if ( dt.aiDisplay.length > 0 )
 		{
 			/* Copy the DataTables' header elements to force the column width in exactly the
 			 * same way that DataTables does it - have the header element, apply the width and
@@ -1069,7 +1084,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 			{
 				iColumn = aiColumns[iIndex];
 
-				nClone = $(this.s.dt.aoColumns[iColumn].nTh).clone(true)[0];
+				nClone = $(dt.aoColumns[iColumn].nTh).clone(true)[0];
 				nClone.innerHTML = "";
 
 				var oStyle = nClone.style;
@@ -1089,9 +1104,10 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				n.removeAttribute('id');
 				var i = that.s.dt.oFeatures.bServerSide===false ?
 					that.s.dt.aiDisplay[ that.s.dt._iDisplayStart+z ] : z;
+				var aTds = that.s.dt.aoData[ i ].anCells || $(this).children('td, th');
+
 				for ( iIndex=0 ; iIndex<aiColumns.length ; iIndex++ )
 				{
-					var aTds = that.s.dt.aoData[i].anCells || that.s.dt.oApi._fnGetTdNodes( that.s.dt, i );
 					iColumn = aiColumns[iIndex];
 
 					if ( aTds.length > 0 )
@@ -1117,13 +1133,21 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 		oClone.body.style.margin = "0";
 		oClone.body.style.padding = "0";
 
-		if ( bAll )
+		// Interop with Scroller - need to use a height forcing element in the
+		// scrolling area in the same way that Scroller does in the body scroll.
+		if ( dt.oScroller !== undefined )
 		{
-			if ( typeof this.s.dt.oScroller != 'undefined' )
-			{
-				oGrid.liner.appendChild( this.s.dt.oScroller.dom.force.cloneNode(true) );
+			var scrollerForcer = dt.oScroller.dom.force;
+
+			if ( ! oGrid.forcer ) {
+				oGrid.forcer = scrollerForcer.cloneNode( true );
+				oGrid.liner.appendChild( oGrid.forcer );
+			}
+			else {
+				oGrid.forcer.style.height = scrollerForcer.style.height;
 			}
 		}
+
 		oGrid.liner.appendChild( oClone.body );
 
 		this._fnEqualiseHeights( 'tbody', that.dom.body, oClone.body );
@@ -1131,7 +1155,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 		/*
 		 * Footer
 		 */
-		if ( this.s.dt.nTFoot !== null )
+		if ( dt.nTFoot !== null )
 		{
 			if ( bAll )
 			{
@@ -1145,7 +1169,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				oGrid.foot.appendChild( oClone.footer );
 
 				/* Copy the footer just like we do for the header */
-				aoCloneLayout = this._fnCopyLayout( this.s.dt.aoFooter, aiColumns );
+				aoCloneLayout = this._fnCopyLayout( dt.aoFooter, aiColumns );
 				var jqCloneTfoot = $('>tfoot', oClone.footer);
 				jqCloneTfoot.empty();
 
@@ -1153,14 +1177,14 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				{
 					jqCloneTfoot[0].appendChild( aoCloneLayout[i].nTr );
 				}
-				this.s.dt.oApi._fnDrawHead( this.s.dt, aoCloneLayout, true );
+				dt.oApi._fnDrawHead( dt, aoCloneLayout, true );
 			}
 			else
 			{
-				aoCloneLayout = this._fnCopyLayout( this.s.dt.aoFooter, aiColumns );
+				aoCloneLayout = this._fnCopyLayout( dt.aoFooter, aiColumns );
 				var aoCurrFooter=[];
 
-				this.s.dt.oApi._fnDetectHeader( aoCurrFooter, $('>tfoot', oClone.footer)[0] );
+				dt.oApi._fnDetectHeader( aoCurrFooter, $('>tfoot', oClone.footer)[0] );
 
 				for ( i=0, iLen=aoCloneLayout.length ; i<iLen ; i++ )
 				{
@@ -1174,7 +1198,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 		}
 
 		/* Equalise the column widths between the header footer and body - body get's priority */
-		var anUnique = this.s.dt.oApi._fnGetUniqueThs( this.s.dt, $('>thead', oClone.header)[0] );
+		var anUnique = dt.oApi._fnGetUniqueThs( dt, $('>thead', oClone.header)[0] );
 		$(anUnique).each( function (i) {
 			iColumn = aiColumns[i];
 			this.style.width = that.s.aiInnerWidths[iColumn]+"px";
@@ -1182,7 +1206,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 
 		if ( that.s.dt.nTFoot !== null )
 		{
-			anUnique = this.s.dt.oApi._fnGetUniqueThs( this.s.dt, $('>tfoot', oClone.footer)[0] );
+			anUnique = dt.oApi._fnGetUniqueThs( dt, $('>tfoot', oClone.footer)[0] );
 			$(anUnique).each( function (i) {
 				iColumn = aiColumns[i];
 				this.style.width = that.s.aiInnerWidths[iColumn]+"px";
@@ -1352,7 +1376,7 @@ FixedColumns.defaults = /** @lends FixedColumns.defaults */{
  *  @default   See code
  *  @static
  */
-FixedColumns.version = "3.0.2";
+FixedColumns.version = "3.0.4";
 
 
 

data/app/assets/javascripts/dataTables/extras/dataTables.responsive.js

@@ -1,15 +1,15 @@
-/*! Responsive 1.0.2
- * 2014 SpryMedia Ltd - datatables.net/license
+/*! Responsive 1.0.5
+ * 2014-2015 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     Responsive
  * @description Responsive tables plug-in for DataTables
- * @version     1.0.2
+ * @version     1.0.5
  * @file        dataTables.responsive.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
- * @copyright   Copyright 2014 SpryMedia Ltd.
+ * @copyright   Copyright 2014-2015 SpryMedia Ltd.
  *
  * This source file is free software, available under the following license:
  *   MIT license - http://datatables.net/license/mit
@@ -122,7 +122,7 @@ Responsive.prototype = {
 
 		// Destroy event handler
 		dt.on( 'destroy.dtr', function () {
-			$(window).off( 'resize.dtr orientationchange.dtr' );
+			$(window).off( 'resize.dtr orientationchange.dtr draw.dtr' );
 		} );
 
 		// Reorder the breakpoints array here in case they have been added out
@@ -133,16 +133,13 @@ Responsive.prototype = {
 		} );
 
 		// Determine which columns are already hidden, and should therefore
-		// remain hidden. TODO - should this be done? See thread 22677
+		// remain hidden. todo - should this be done? See thread 22677
 		//
 		// this.s.alwaysHidden = dt.columns(':hidden').indexes();
 
 		this._classLogic();
 		this._resizeAuto();
 
-		// First pass - draw the table for the current viewport size
-		this._resize();
-
 		// Details handler
 		var details = this.c.details;
 		if ( details.type ) {
@@ -153,8 +150,24 @@ Responsive.prototype = {
 				that._detailsVis();
 			} );
 
+			// Redraw the details box on each draw. This is used until
+			// DataTables implements a native `updated` event for rows
+			dt.on( 'draw.dtr', function () {
+				dt.rows( {page: 'current'} ).iterator( 'row', function ( settings, idx ) {
+					var row = dt.row( idx );
+
+					if ( row.child.isShown() ) {
+						var info = that.c.details.renderer( dt, idx );
+						row.child( info, 'child' ).show();
+					}
+				} );
+			} );
+
 			$(dt.table().node()).addClass( 'dtr-'+details.type );
 		}
+
+		// First pass - draw the table for the current viewport size
+		this._resize();
 	},
 
 
@@ -200,25 +213,43 @@ Responsive.prototype = {
 			}
 		}
 
-		// Second pass, use up any remaining width for other columns
-		var widthAvailable = dt.table().container().offsetWidth;
+		// Second pass, use up any remaining width for other columns. For
+		// scrolling tables we need to subtract the width of the scrollbar. It
+		// may not be requires which makes this sub-optimal, but it would
+		// require another full redraw to make complete use of those extra few
+		// pixels
+		var scrolling = dt.settings()[0].oScroll;
+		var bar = scrolling.sY || scrolling.sX ? scrolling.iBarWidth : 0;
+		var widthAvailable = dt.table().container().offsetWidth - bar;
 		var usedWidth = widthAvailable - requiredWidth;
 
+		// Control column needs to always be included. This makes it sub-
+		// optimal in terms of using the available with, but to stop layout
+		// thrashing or overflow. Also we need to account for the control column
+		// width first so we know how much width is available for the other
+		// columns, since the control column might not be the first one shown
 		for ( i=0, ien=display.length ; i<ien ; i++ ) {
-			// Control column needs to always be included. This makes it sub-
-			// optimal in terms of using the available with, but to stop layout
-			// thrashing or overflow
 			if ( columns[i].control ) {
 				usedWidth -= columns[i].minWidth;
 			}
-			else if ( display[i] === '-' ) {
-				// Otherwise, remove the width
-				display[i] = usedWidth - columns[i].minWidth < 0 ?
-					false :
-					true;
-
-				// Continue counting down the width, so a smaller column to the
-				// left won't be shown
+		}
+
+		// Allow columns to be shown (counting from the left) until we run out
+		// of room
+		var empty = false;
+		for ( i=0, ien=display.length ; i<ien ; i++ ) {
+			if ( display[i] === '-' && ! columns[i].control ) {
+				// Once we've found a column that won't fit we don't let any
+				// others display either, or columns might disappear in the
+				// middle of the table
+				if ( empty || usedWidth - columns[i].minWidth < 0 ) {
+					empty = true;
+					display[i] = false;
+				}
+				else {
+					display[i] = true;
+				}
+
 				usedWidth -= columns[i].minWidth;
 			}
 		}
@@ -476,11 +507,8 @@ Responsive.prototype = {
 		}
 
 		if ( haveHidden ) {
-			// Got hidden columns
-			$( dt.table().node() ).addClass('collapsed');
-
 			// Show all existing child rows
-			dt.rows().eq(0).each( function (idx) {
+			dt.rows( { page: 'current' } ).eq(0).each( function (idx) {
 				var row = dt.row( idx );
 
 				if ( row.child() ) {
@@ -497,11 +525,8 @@ Responsive.prototype = {
 			} );
 		}
 		else {
-			// No hidden columns
-			$( dt.table().node() ).removeClass('collapsed');
-
 			// Hide all existing child rows
-			dt.rows().eq(0).each( function (idx) {
+			dt.rows( { page: 'current' } ).eq(0).each( function (idx) {
 				dt.row( idx ).child.hide();
 			} );
 		}
@@ -538,9 +563,11 @@ Responsive.prototype = {
 		var width = $(window).width();
 		var breakpoints = this.c.breakpoints;
 		var breakpoint = breakpoints[0].name;
+		var columns = this.s.columns;
+		var i, ien;
 
 		// Determine what breakpoint we are currently at
-		for ( var i=breakpoints.length-1 ; i>=0 ; i-- ) {
+		for ( i=breakpoints.length-1 ; i>=0 ; i-- ) {
 			if ( width <= breakpoints[i].width ) {
 				breakpoint = breakpoints[i].name;
 				break;
@@ -548,10 +575,23 @@ Responsive.prototype = {
 		}
 		
 		// Show the columns for that break point
-		var columns = this._columnsVisiblity( breakpoint );
+		var columnsVis = this._columnsVisiblity( breakpoint );
+
+		// Set the class before the column visibility is changed so event
+		// listeners know what the state is. Need to determine if there are
+		// any columns that are not visible but can be shown
+		var collapsedClass = false;
+		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
+			if ( columnsVis[i] === false && ! columns[i].never ) {
+				collapsedClass = true;
+				break;
+			}
+		}
+
+		$( dt.table().node() ).toggleClass('collapsed', collapsedClass );
 
 		dt.columns().eq(0).each( function ( colIdx, i ) {
-			dt.column( colIdx ).visible( columns[i] );
+			dt.column( colIdx ).visible( columnsVis[i] );
 		} );
 	},
 
@@ -587,6 +627,8 @@ Responsive.prototype = {
 		var clonedHeader = $( dt.table().header().cloneNode( false ) ).appendTo( clonedTable );
 		var clonedBody   = $( dt.table().body().cloneNode( false ) ).appendTo( clonedTable );
 
+		$( dt.table().footer() ).clone( false ).appendTo( clonedTable );
+
 		// This is a bit slow, but we need to get a clone of each row that
 		// includes all columns. As such, try to do this as little as possible.
 		dt.rows( { page: 'current' } ).indexes().flatten().each( function ( idx ) {
@@ -599,8 +641,12 @@ Responsive.prototype = {
 			$(clone).appendTo( clonedBody );
 		} );
 
-		var cells        = dt.columns().header().to$().clone( false ).wrapAll('tr').appendTo( clonedHeader );
-		var inserted     = $('<div/>')
+		var cells = dt.columns().header().to$().clone( false );
+		$('<tr/>')
+			.append( cells )
+			.appendTo( clonedHeader );
+
+		var inserted = $('<div/>')
 			.css( {
 				width: 1,
 				height: 1,
@@ -699,10 +745,14 @@ Responsive.defaults = {
 				var cellData = dtPrivate.oApi._fnGetCellData(
 					dtPrivate, idx.row, idx.column, 'display'
 				);
+				var title = header.text();
+				if ( title ) {
+					title = title + ':';
+				}
 
 				return '<li data-dtr-index="'+idx.column+'">'+
 						'<span class="dtr-title">'+
-							header.text()+':'+
+							title+
 						'</span> '+
 						'<span class="dtr-data">'+
 							cellData+
@@ -732,15 +782,6 @@ Api.register( 'responsive()', function () {
 	return this;
 } );
 
-Api.register( 'responsive.recalc()', function () {
-	this.iterator( 'table', function ( ctx ) {
-		if ( ctx._responsive ) {
-			ctx._responsive._resizeAuto();
-			ctx._responsive._resize();
-		}
-	} );
-} );
-
 Api.register( 'responsive.index()', function ( li ) {
 	li = $(li);
 
@@ -750,6 +791,23 @@ Api.register( 'responsive.index()', function ( li ) {
 	};
 } );
 
+Api.register( 'responsive.rebuild()', function () {
+	return this.iterator( 'table', function ( ctx ) {
+		if ( ctx._responsive ) {
+			ctx._responsive._classLogic();
+		}
+	} );
+} );
+
+Api.register( 'responsive.recalc()', function () {
+	return this.iterator( 'table', function ( ctx ) {
+		if ( ctx._responsive ) {
+			ctx._responsive._resizeAuto();
+			ctx._responsive._resize();
+		}
+	} );
+} );
+
 
 /**
  * Version information
@@ -757,7 +815,7 @@ Api.register( 'responsive.index()', function ( li ) {
  * @name Responsive.version
  * @static
  */
-Responsive.version = '1.0.2';
+Responsive.version = '1.0.5';
 
 
 $.fn.dataTable.Responsive = Responsive;
@@ -766,11 +824,17 @@ $.fn.DataTable.Responsive = Responsive;
 // Attach a listener to the document which listens for DataTables initialisation
 // events so we can automatically initialise
 $(document).on( 'init.dt.dtr', function (e, settings, json) {
+	if ( e.namespace !== 'dt' ) {
+		return;
+	}
+
 	if ( $(settings.nTable).hasClass( 'responsive' ) ||
 		 $(settings.nTable).hasClass( 'dt-responsive' ) ||
 		 settings.oInit.responsive ||
 		 DataTable.defaults.responsive
 	) {
+		console.log( e.namespace );
+
 		var init = settings.oInit.responsive;
 
 		if ( init !== false ) {
@@ -798,4 +862,3 @@ else if ( jQuery && !jQuery.fn.dataTable.Responsive ) {
 
 
 })(window, document);
-