ColReorder and ColVis updates

Author: kormoc

js/DataTables/extras/ColReorder/col_filter.html

@@ -58,7 +58,8 @@
 					],
 					"oLanguage": {
 						"sSearch": "Search all columns:"
-					}
+					},
+					"bSortCellsTop": true
 				} );
 			} );
 		</script>
@@ -76,7 +77,7 @@ <h1>Preamble</h1>
 				elements, and finally of course the filtering itself. Note that it is important to use
 				the _fnVisibleToColumnIndex() internal function to calculate which column index should
 				be given to fnFilter (or you could employ your own methods).</p>
-			<p>Please note that this demo requires DataTables 1.7.5 or later.</p>
+			<p>Please note that this demo requires DataTables 1.8 or later.</p>
 
 			<h1>Live example</h1>
 			<form>
@@ -572,7 +573,8 @@ <h1>Initialisation code</h1>
 		],
 		"oLanguage": {
 			"sSearch": "Search all columns:"
-		}
+		},
+		"bSortCellsTop": true
 	} );
 } );</pre>
 

js/DataTables/extras/ColReorder/media/docs/46848f6f3b.html

@@ -68,7 +68,7 @@ <h2>Navigation</h2>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/docs/4f1246032c.html

@@ -68,7 +68,7 @@ <h2>Navigation</h2>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/docs/ColReorder.html

@@ -139,7 +139,7 @@ <h5>Parameters:</h5>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/docs/a69b02bcf2.html

@@ -68,7 +68,7 @@ <h2>Navigation</h2>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/docs/global.html

@@ -170,7 +170,7 @@ <h5>Parameters:</h5>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/docs/index.html

@@ -33,7 +33,7 @@ <h3 class="subsection-title">Table of Contents</h3>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:31
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/media/js/ColReorder.js

@@ -1,6 +1,6 @@
 /*
  * File:        ColReorder.js
- * Version:     1.0.5
+ * Version:     1.0.6
  * CVS:         $Id$
  * Description: Controls for column visiblity in DataTables
  * Author:      Allan Jardine (www.sprymedia.co.uk)
@@ -274,13 +274,12 @@ $.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo )
 	}
 
 
-	/*
-	 * Any extra operations for the other plug-ins
-	 */
-	if ( typeof ColVis != 'undefined' )
-	{
-		ColVis.fnRebuild( oSettings.oInstance );
-	}
+	/* Fire an event so other plug-ins can update */
+	$(oSettings.oInstance).trigger( 'column-reorder', [ oSettings, {
+		"iFrom": iFrom,
+		"iTo": iTo,
+		"aiInvertMapping": aiInvertMapping
+	} ] );
 
 	if ( typeof oSettings.oInstance._oPluginFixedHeader != 'undefined' )
 	{
@@ -527,7 +526,7 @@ ColReorder.prototype = {
 	{
 		if ( a.length != this.s.dt.aoColumns.length )
 		{
-			this.s.dt.oInstance.oApi._fnLog( oDTSettings, 1, "ColReorder - array reorder does not "+
+			this.s.dt.oInstance.oApi._fnLog( this.s.dt, 1, "ColReorder - array reorder does not "+
 			 	"match known number of columns. Skipping." );
 			return;
 		}
@@ -611,8 +610,8 @@ ColReorder.prototype = {
 	{
 		var that = this;
 		$(nTh).bind( 'mousedown.ColReorder', function (e) {
+			e.preventDefault();
 			that._fnMouseDown.call( that, e, nTh );
-			return false;
 		} );
 	},
 
@@ -914,7 +913,7 @@ ColReorder.prototype.CLASS = "ColReorder";
  *  @type      String
  *  @default   As code
  */
-ColReorder.VERSION = "1.0.5";
+ColReorder.VERSION = "1.0.6";
 ColReorder.prototype.VERSION = ColReorder.VERSION;
 
 

js/DataTables/extras/ColReorder/media/js/ColReorder.min.js

@@ -484,7 +484,7 @@ <h1>Examples</h1>
 			<h1>Initialisation code</h1>
 			<pre>$(document).ready( function () {
 	var oTable = $('#example').dataTable( {
-		"sDom": 'R&lt;"H"lfr&gt;t&lt;"F"ip&lt;',
+		"sDom": 'R&lt;"H"lfr&gt;t&lt;"F"ip&gt;',
 		"bJQueryUI": true,
 		"sPaginationType": "full_numbers"
 	} );

js/DataTables/extras/ColReorder/media/js/ColReorder.min.js.gz

@@ -143,7 +143,7 @@ <h5>Parameters:</h5>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:30
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColReorder/theme.html

@@ -68,7 +68,7 @@ <h2>Navigation</h2>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:30
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColVis/media/docs/ColVis.html

@@ -68,7 +68,7 @@ <h2>Navigation</h2>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:30
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColVis/media/docs/a69b02bcf2.html

@@ -107,7 +107,7 @@ <h5>Returns:</h5><p class="returns">void</p></div>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:30
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColVis/media/docs/ccb5a49865.html

@@ -33,7 +33,7 @@ <h3 class="subsection-title">Table of Contents</h3>
 
 
 			Documentation generated by <a href="https://github.com/micmath/JSDoc">JSDoc 3</a> on
-			15th Apr 2012 - 19:30
+			21th Jun 2012 - 16:43
 			with the <a href="http://datatables.net/">DataTables</a> template.
 		</div>
 	</body>

js/DataTables/extras/ColVis/media/docs/global.html

@@ -1,6 +1,6 @@
 /*
  * File:        ColVis.js
- * Version:     1.0.7
+ * Version:     1.0.8
  * CVS:         $Id$
  * Description: Controls for column visiblity in DataTables
  * Author:      Allan Jardine (www.sprymedia.co.uk)
@@ -313,6 +313,7 @@ ColVis.prototype = {
 		this._fnApplyCustomisation();
 
 		var that = this;
+		var i, iLen;
 		this.dom.wrapper = document.createElement('div');
 		this.dom.wrapper.className = "ColVis TableTools";
 
@@ -327,7 +328,7 @@ ColVis.prototype = {
 		this._fnAddButtons();
 
 		/* Store the original visbility information */
-		for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
+		for ( i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
 		{
 			this.s.abOriginal.push( this.s.dt.aoColumns[i].bVisible );
 		}
@@ -339,6 +340,20 @@ ColVis.prototype = {
 			},
 			"sName": "ColVis"
 		} );
+
+		/* If columns are reordered, then we need to update our exclude list and
+		 * rebuild the displayed list
+		 */
+		$(this.s.dt.oInstance).bind( 'column-reorder', function ( e, oSettings, oReorder ) {
+			for ( i=0, iLen=that.s.aiExclude.length ; i<iLen ; i++ ) {
+				that.s.aiExclude[i] = oReorder.aiInvertMapping[ that.s.aiExclude[i] ];
+			}
+
+			var mStore = that.s.abOriginal.splice( oReorder.iFrom, 1 )[0];
+			that.s.abOriginal.splice( oReorder.iTo, 0, mStore );
+			
+			that.fnRebuild();
+		} );
 	},
 
 
@@ -420,8 +435,8 @@ ColVis.prototype = {
 
 
 	/**
-	 * On each table draw, check the visiblity checkboxes as needed. This allows any process to
-	 * update the table's column visiblity and ColVis will still be accurate.
+	 * On each table draw, check the visibility checkboxes as needed. This allows any process to
+	 * update the table's column visibility and ColVis will still be accurate.
 	 *  @method  _fnDrawCallback
 	 *  @returns void
 	 *  @private 
@@ -515,6 +530,7 @@ ColVis.prototype = {
 				that.s.dt.oInstance.fnSetColumnVis( i, that.s.abOriginal[i], false );
 			}
 			that._fnAdjustOpenRows();
+			that.s.dt.oInstance.fnAdjustColumnSizing( false );
 			that.s.dt.oInstance.fnDraw( false );
 		} );
 
@@ -549,6 +565,7 @@ ColVis.prototype = {
 				}
 			}
 			that._fnAdjustOpenRows();
+			that.s.dt.oInstance.fnAdjustColumnSizing( false );
 			that.s.dt.oInstance.fnDraw( false );
 		} );
 
@@ -597,6 +614,7 @@ ColVis.prototype = {
 			if ( dt.oFeatures.bServerSide && (dt.oScroll.sX !== "" || dt.oScroll.sY !== "" ) )
 			{
 				that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
+				that.s.dt.oInstance.fnAdjustColumnSizing( false );
 				that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );
 				that._fnDrawCallback();
 			}
@@ -923,7 +941,7 @@ ColVis.fnRebuild = function ( oTable )
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Static object propterties
+ * Static object properties
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**
@@ -958,7 +976,7 @@ ColVis.prototype.CLASS = "ColVis";
  *  @type      String
  *  @default   See code
  */
-ColVis.VERSION = "1.0.7";
+ColVis.VERSION = "1.0.8";
 ColVis.prototype.VERSION = ColVis.VERSION;