jquery-datatables-rails 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546fa2f6a7a4ab5f7d4d82818d6e7973eaa06804
-  data.tar.gz: 5848dec5f60bcffdb7a62541f245bbe2496e14b4
+  metadata.gz: d5f212953d1541c80c223fc8b30b3c034eea8474
+  data.tar.gz: c42274576cf87f64e3090feff9c08e10e5bd2496
 SHA512:
-  metadata.gz: bd89f29659b087accea80609f6ebacc68b9ed3819468016ecac0ab080d7ecb591595e501b00c3bd087be098930363c9a30784dbe48ddcf6ccb4e6b9e588306d3
-  data.tar.gz: 6129ab5f8dbc7448f27d36a3b4658f30c4042889524ed61c59fff87e9b0b3499b686a2d7392d65a2b1699e7369e60f7967bcafbb69dde0c4faf579feb504ea3f
+  metadata.gz: 7ef688e522397c430b04bbbf81a432e3a40c328bdb5fe6fe07f7afc174b16a96dd82366327864db458bdef4a571d9cebee92fcabca86bb689856449957ed2ca4
+  data.tar.gz: 6b1270bdfe70fd8a8b927205dcd868e504d5210f6204e7859737bdf2ce17de5a9a2e074dcf051b25af78a2376e4b02546649dd1d18f7e36123132e3b6399e7b9

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

@@ -1,11 +1,11 @@
-/*! AutoFill 1.2.0
+/*! AutoFill 1.2.1
  * ©2008-2014 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     AutoFill
  * @description Add Excel like click and drag auto-fill options to DataTables
- * @version     1.2.0
+ * @version     1.2.1
  * @file        dataTables.autoFill.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -720,7 +720,7 @@ DataTable.AutoFill = AutoFill;
  *  @type      String
  *  @default   See code
  */
-AutoFill.version = "1.2.0";
+AutoFill.version = "1.2.1";
 
 
 /**
@@ -839,7 +839,11 @@ return AutoFill;
 
 // Define as an AMD module if possible
 if ( typeof define === 'function' && define.amd ) {
-	define( 'datatables-autofill', ['jquery', 'datatables'], factory );
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
 }
 else if ( jQuery && !jQuery.fn.dataTable.AutoFill ) {
 	// Otherwise simply initialise as normal, stopping multiple evaluation

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

@@ -1,11 +1,11 @@
-/*! ColReorder 1.1.1
+/*! ColReorder 1.1.2
  * ©2010-2014 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     ColReorder
  * @description Provide the ability to reorder columns in a DataTable
- * @version     1.1.1
+ * @version     1.1.2
  * @file        dataTables.colReorder.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -111,6 +111,20 @@ $.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo )
 {
 	var v110 = $.fn.dataTable.Api ? true : false;
 	var i, iLen, j, jLen, iCols=oSettings.aoColumns.length, nTrs, oCol;
+	var attrMap = function ( obj, prop, mapping ) {
+		if ( ! obj[ prop ] ) {
+			return;
+		}
+
+		var a = obj[ prop ].split('.');
+		var num = a.shift();
+
+		if ( isNaN( num*1 ) ) {
+			return;
+		}
+
+		obj[ prop ] = mapping[ num*1 ]+'.'+a.join('.');
+	};
 
 	/* Sanity check in the input */
 	if ( iFrom == iTo )
@@ -187,9 +201,20 @@ $.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo )
 	for ( i=0, iLen=iCols ; i<iLen ; i++ )
 	{
 		oCol = oSettings.aoColumns[i];
+
 		if ( typeof oCol.mData == 'number' ) {
 			oCol.mData = aiInvertMapping[ oCol.mData ];
 
+			// regenerate the get / set functions
+			oSettings.oApi._fnColumnOptions( oSettings, i, {} );
+		}
+		else if ( $.isPlainObject( oCol.mData ) ) {
+			// HTML5 data sourced
+			attrMap( oCol.mData, '_',      aiInvertMapping );
+			attrMap( oCol.mData, 'filter', aiInvertMapping );
+			attrMap( oCol.mData, 'sort',   aiInvertMapping );
+			attrMap( oCol.mData, 'type',   aiInvertMapping );
+
 			// regenerate the get / set functions
 			oSettings.oApi._fnColumnOptions( oSettings, i, {} );
 		}
@@ -366,8 +391,10 @@ var ColReorder = function( dt, opts )
 	}
 
 	// Convert from camelCase to Hungarian, just as DataTables does
-	if ( $.fn.dataTable.camelToHungarian ) {
-		$.fn.dataTable.camelToHungarian( ColReorder.defaults, opts || {} );
+	var camelToHungarian = $.fn.dataTable.camelToHungarian;
+	if ( camelToHungarian ) {
+		camelToHungarian( ColReorder.defaults, ColReorder.defaults, true );
+		camelToHungarian( ColReorder.defaults, opts || {} );
 	}
 
 
@@ -732,28 +759,51 @@ ColReorder.prototype = {
 	{
 		var i, iLen, aCopy, iOrigColumn;
 		var oSettings = this.s.dt;
+		var columns = oSettings.aoColumns;
+
+		oState.ColReorder = [];
 
 		/* Sorting */
-		for ( i=0 ; i<oState.aaSorting.length ; i++ )
-		{
-			oState.aaSorting[i][0] = oSettings.aoColumns[ oState.aaSorting[i][0] ]._ColReorder_iOrigCol;
-		}
+		if ( oState.aaSorting ) {
+			// 1.10.0-
+			for ( i=0 ; i<oState.aaSorting.length ; i++ ) {
+				oState.aaSorting[i][0] = columns[ oState.aaSorting[i][0] ]._ColReorder_iOrigCol;
+			}
 
-		var aSearchCopy = $.extend( true, [], oState.aoSearchCols );
-		oState.ColReorder = [];
+			var aSearchCopy = $.extend( true, [], oState.aoSearchCols );
 
-		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-		{
-			iOrigColumn = oSettings.aoColumns[i]._ColReorder_iOrigCol;
+			for ( i=0, iLen=columns.length ; i<iLen ; i++ )
+			{
+				iOrigColumn = columns[i]._ColReorder_iOrigCol;
 
-			/* Column filter */
-			oState.aoSearchCols[ iOrigColumn ] = aSearchCopy[i];
+				/* Column filter */
+				oState.aoSearchCols[ iOrigColumn ] = aSearchCopy[i];
 
-			/* Visibility */
-			oState.abVisCols[ iOrigColumn ] = oSettings.aoColumns[i].bVisible;
+				/* Visibility */
+				oState.abVisCols[ iOrigColumn ] = columns[i].bVisible;
 
-			/* Column reordering */
-			oState.ColReorder.push( iOrigColumn );
+				/* Column reordering */
+				oState.ColReorder.push( iOrigColumn );
+			}
+		}
+		else if ( oState.order ) {
+			// 1.10.1+
+			for ( i=0 ; i<oState.order.length ; i++ ) {
+				oState.order[i][0] = columns[ oState.order[i][0] ]._ColReorder_iOrigCol;
+			}
+
+			var stateColumnsCopy = $.extend( true, [], oState.columns );
+
+			for ( i=0, iLen=columns.length ; i<iLen ; i++ )
+			{
+				iOrigColumn = columns[i]._ColReorder_iOrigCol;
+
+				/* Columns */
+				oState.columns[ iOrigColumn ] = stateColumnsCopy[i];
+
+				/* Column reordering */
+				oState.ColReorder.push( iOrigColumn );
+			}
 		}
 	},
 
@@ -1236,7 +1286,7 @@ ColReorder.defaults = {
  *  @type      String
  *  @default   As code
  */
-ColReorder.version = "1.1.1";
+ColReorder.version = "1.1.2";
 
 
 
@@ -1306,7 +1356,11 @@ return ColReorder;
 
 // Define as an AMD module if possible
 if ( typeof define === 'function' && define.amd ) {
-	define( 'datatables-colreorder', ['jquery', 'datatables'], factory );
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
 }
 else if ( jQuery && !jQuery.fn.dataTable.ColReorder ) {
 	// Otherwise simply initialise as normal, stopping multiple evaluation

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

@@ -1,11 +1,11 @@
-/*! ColVis 1.1.0
+/*! ColVis 1.1.1
  * ©2010-2014 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     ColVis
  * @description Controls for column visibility in DataTables
- * @version     1.1.0
+ * @version     1.1.1
  * @file        dataTables.colReorder.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -463,11 +463,18 @@ ColVis.prototype = {
 
 		if ( this.s.showAll )
 		{
-			nButton = this._fnDomShowAllButton();
+			nButton = this._fnDomShowXButton( this.s.showAll, true );
 			nButton.className += " ColVis_ShowAll";
 			this.dom.buttons.push( nButton );
 		}
 
+		if ( this.s.showNone )
+		{
+			nButton = this._fnDomShowXButton( this.s.showNone, false );
+			nButton.className += " ColVis_ShowNone";
+			this.dom.buttons.push( nButton );
+		}
+
 		$(this.dom.collection).append( this.dom.buttons );
 	},
 
@@ -502,12 +509,12 @@ ColVis.prototype = {
 
 
 	/**
-	 * Create a button which allows a "show all" action
-	 *  @method  _fnDomShowAllButton
+	 * Create a button which allows show all and show node actions
+	 *  @method  _fnDomShowXButton
 	 *  @returns {Node} Created button
 	 *  @private
 	 */
-	"_fnDomShowAllButton": function ()
+	"_fnDomShowXButton": function ( str, action )
 	{
 		var
 			that = this,
@@ -515,7 +522,7 @@ ColVis.prototype = {
 
 		return $(
 				'<li class="ColVis_Special '+(dt.bJUI ? 'ui-button ui-state-default' : '')+'">'+
-					this.s.showAll+
+					str+
 				'</li>'
 			)
 			.click( function (e) {
@@ -523,7 +530,7 @@ ColVis.prototype = {
 				{
 					if (that.s.aiExclude.indexOf(i) === -1)
 					{
-						that.s.dt.oInstance.fnSetColumnVis( i, true, false );
+						that.s.dt.oInstance.fnSetColumnVis( i, action, false );
 					}
 				}
 				that._fnAdjustOpenRows();
@@ -627,7 +634,7 @@ ColVis.prototype = {
 
 				$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */
 
-				if ( that.s.fnStateChange !== null )
+				if ( e.target.nodeName.toLowerCase() === 'input' && that.s.fnStateChange !== null )
 				{
 					that.s.fnStateChange.call( that, i, showHide );
 				}
@@ -1039,7 +1046,7 @@ ColVis.prototype.CLASS = "ColVis";
  *  @type      String
  *  @default   See code
  */
-ColVis.VERSION = "1.1.0";
+ColVis.VERSION = "1.1.1";
 ColVis.prototype.VERSION = ColVis.VERSION;
 
 
@@ -1084,7 +1091,11 @@ return ColVis;
 
 // Define as an AMD module if possible
 if ( typeof define === 'function' && define.amd ) {
-	define( 'datatables-colvis', ['jquery', 'datatables'], factory );
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
 }
 else if ( jQuery && !jQuery.fn.dataTable.ColVis ) {
 	// Otherwise simply initialise as normal, stopping multiple evaluation

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

@@ -1,11 +1,11 @@
-/*! FixedColumns 3.0.1
+/*! FixedColumns 3.0.2
  * ©2010-2014 SpryMedia Ltd - datatables.net/license
  */
 
 /**
  * @summary     FixedColumns
  * @description Freeze columns in place on a scrolling DataTable
- * @version     3.0.1
+ * @version     3.0.2
  * @file        dataTables.fixedColumns.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -483,6 +483,10 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				}
 			} );
 
+		var wheelType = 'onwheel' in document.createElement('div') ?
+			'wheel.DTFC' :
+			'mousewheel.DTFC';
+
 		if ( that.s.iLeftColumns > 0 ) {
 			// When scrolling the left column, scroll the body and right column
 			$(that.dom.grid.left.liner)
@@ -497,9 +501,11 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 						}
 					}
 				} )
-				.on( "wheel.DTFC", function(e) {
+				.on( wheelType, function(e) { // xxx update the destroy as well
 					// Pass horizontal scrolling through
-					var xDelta = -e.originalEvent.deltaX;
+					var xDelta = e.type === 'wheel' ?
+						-e.originalEvent.deltaX :
+						e.originalEvent.wheelDeltaX;
 					that.dom.scroller.scrollLeft -= xDelta;
 				} );
 		}
@@ -518,9 +524,11 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 						}
 					}
 				} )
-				.on( "wheel.DTFC", function(e) {
+				.on( wheelType, function(e) {
 					// Pass horizontal scrolling through
-					var xDelta = -e.originalEvent.deltaX;
+					var xDelta = e.type === 'wheel' ?
+						-e.originalEvent.deltaX :
+						e.originalEvent.wheelDeltaX;
 					that.dom.scroller.scrollLeft -= xDelta;
 				} );
 		}
@@ -552,10 +560,10 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				$(that.dom.scroller).off( 'scroll.DTFC mouseover.DTFC' );
 				$(window).off( 'resize.DTFC' );
 
-				$(that.dom.grid.left.liner).off( 'scroll.DTFC wheel.DTFC mouseover.DTFC' );
+				$(that.dom.grid.left.liner).off( 'scroll.DTFC mouseover.DTFC '+wheelType );
 				$(that.dom.grid.left.wrapper).remove();
 
-				$(that.dom.grid.right.liner).off( 'scroll.DTFC wheel.DTFC mouseover.DTFC' );
+				$(that.dom.grid.right.liner).off( 'scroll.DTFC mouseover.DTFC '+wheelType );
 				$(that.dom.grid.right.wrapper).remove();
 			} );
 
@@ -583,6 +591,7 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 
 		$.each( this.s.dt.aoColumns, function (i, col) {
 			var th = $(col.nTh);
+			var border;
 
 			if ( ! th.filter(':visible').length ) {
 				that.s.aiInnerWidths.push( 0 );
@@ -598,7 +607,13 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 				// table's border to the outerWidth, since we need to take
 				// account of it, but it isn't in any cell
 				if ( that.s.aiOuterWidths.length === 0 ) {
-					var border = $(that.s.dt.nTable).css('border-left-width');
+					border = $(that.s.dt.nTable).css('border-left-width');
+					iWidth += typeof border === 'string' ? 1 : parseInt( border, 10 );
+				}
+
+				// Likewise with the final column on the right
+				if ( that.s.aiOuterWidths.length === that.s.dt.aoColumns.length-1 ) {
+					border = $(that.s.dt.nTable).css('border-right-width');
 					iWidth += typeof border === 'string' ? 1 : parseInt( border, 10 );
 				}
 
@@ -724,8 +739,8 @@ FixedColumns.prototype = /** @lends FixedColumns.prototype */{
 	{
 		var oGrid = this.dom.grid;
 		var iWidth = $(oGrid.wrapper).width();
-		var iBodyHeight = $(this.s.dt.nTable.parentNode).height();
-		var iFullHeight = $(this.s.dt.nTable.parentNode.parentNode).height();
+		var iBodyHeight = $(this.s.dt.nTable.parentNode).outerHeight();
+		var iFullHeight = $(this.s.dt.nTable.parentNode.parentNode).outerHeight();
 		var oOverflow = this._fnDTOverflow();
 		var
 			iLeftWidth = this.s.iLeftWidth,
@@ -1337,7 +1352,7 @@ FixedColumns.defaults = /** @lends FixedColumns.defaults */{
  *  @default   See code
  *  @static
  */
-FixedColumns.version = "3.0.1";
+FixedColumns.version = "3.0.2";
 
 
 
@@ -1368,7 +1383,11 @@ return FixedColumns;
 
 // Define as an AMD module if possible
 if ( typeof define === 'function' && define.amd ) {
-	define( 'datatables-fixedcolumns', ['jquery', 'datatables'], factory );
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
 }
 else if ( jQuery && !jQuery.fn.dataTable.FixedColumns ) {
 	// Otherwise simply initialise as normal, stopping multiple evaluation

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

@@ -1,4 +1,4 @@
-/*! FixedHeader 2.1.1
+/*! FixedHeader 2.1.2
  * ©2010-2014 SpryMedia Ltd - datatables.net/license
  */
 
@@ -6,7 +6,7 @@
  * @summary     FixedHeader
  * @description Fix a table's header or footer, so it is always visible while
  *              Scrolling
- * @version     2.1.1
+ * @version     2.1.2
  * @file        dataTables.fixedHeader.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -982,7 +982,7 @@ FixedHeader.fnMeasure = function ()
 };
 
 
-FixedHeader.version = "2.1.1";
+FixedHeader.version = "2.1.2";
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1012,7 +1012,11 @@ return FixedHeader;
 
 // Define as an AMD module if possible
 if ( typeof define === 'function' && define.amd ) {
-	define( 'datatables-fixedheader', ['jquery', 'datatables'], factory );
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
 }
 else if ( jQuery && !jQuery.fn.dataTable.FixedHeader ) {
 	// Otherwise simply initialise as normal, stopping multiple evaluation