From e55841cbc8ee5879699f2d9078cb2ccd9f7a11ab Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Tue, 13 Nov 2012 15:03:38 -0600
Subject: [PATCH 1/3] enable show/hide on serverside processing table columns
 without reloading the data (unless of course, you're reordering the data or
 changing pages)

---
 media/js/ColVis.js | 73 +++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/media/js/ColVis.js b/media/js/ColVis.js
index b049e63..06bcf98 100755
--- a/media/js/ColVis.js
+++ b/media/js/ColVis.js
@@ -1,6 +1,6 @@
 /*
  * File:        ColVis.js
- * Version:     1.0.9.dev
+ * Version:     1.0.8
  * CVS:         $Id$
  * Description: Controls for column visiblity in DataTables
  * Author:      Allan Jardine (www.sprymedia.co.uk)
@@ -159,7 +159,7 @@ ColVis = function( oDTSettings, oInit )
 		 *  @type     Integer
 		 *  @default  500
 		 */
-		"iOverlayFade": 500,
+		"iOverlayFade": 0,
 		
 		/**
 		 * Label callback for column names. Takes three parameters: 1. the column index, 2. the column
@@ -610,18 +610,15 @@ ColVis.prototype = {
 			var oldIndex = $.fn.dataTableExt.iApiIndex;
 			$.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
 
-			// Optimisation for server-side processing when scrolling - don't do a full redraw
+			that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
+			that.s.dt.oInstance.fnAdjustColumnSizing( false );
+
 			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();
-			}
-			else
-			{
-				that.s.dt.oInstance.fnSetColumnVis( i, showHide );
+				that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );				
 			}
+			
+			that._fnDrawCallback();
 
 			$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */
 			
@@ -774,7 +771,7 @@ ColVis.prototype = {
 	 */
 	"_fnCollectionShow": function ()
 	{
-		var that = this, i, iLen, iLeft;
+		var that = this, i, iLen;
 		var oPos = $(this.dom.button).offset();
 		var nHidden = this.dom.collection;
 		var nBackground = this.dom.background;
@@ -786,14 +783,14 @@ ColVis.prototype = {
 			nHidden.style.top = iDivY+"px";
 			nHidden.style.left = iDivX+"px";
 		}
+		nHidden.style.display = "block";
+		$(nHidden).css('opacity',0);
 		
-		$(nHidden).css( {
-			'display': 'block',
-			'opacity': 0
-		} );
+		var iWinHeight = $(window).height(), iDocHeight = $(document).height(),
+		 	iWinWidth = $(window).width(), iDocWidth = $(document).width();
 		
-		nBackground.style.bottom ='0px';
-		nBackground.style.right = '0px';
+		nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px";
+		nBackground.style.width = ((iWinWidth<iDocWidth)? iWinWidth : iDocWidth) +"px";
 		
 		var oStyle = this.dom.catcher.style;
 		oStyle.height = $(this.dom.button).outerHeight()+"px";
@@ -829,39 +826,35 @@ ColVis.prototype = {
 			this.dom.collection.style.width = iMax+"px";
 		}
 		
-		/* This results in a very small delay for the end user but it allows the animation to be
-		 * much smoother. If you don't want the animation, then the setTimeout can be removed
-		 */
-		$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
-		$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
-			/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
-			 * reflected. As such, we need to do it here, once it is visible. Unbelievable.
-			 */
-			if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
-			{
-				that._fnDrawCallback();
-			}
-		});
-		
 		/* Visual corrections to try and keep the collection visible */
 		if ( !this.s.bCssPosition )
 		{
-			iLeft = ( this.s.sAlign=="left" ) ?
-				iDivX :
-				iDivX - $(nHidden).outerWidth() + $(this.dom.button).outerWidth();
-
-			nHidden.style.left = iLeft+"px";
+			nHidden.style.left = this.s.sAlign=="left" ?
+				iDivX+"px" : (iDivX-$(nHidden).outerWidth()+$(this.dom.button).outerWidth())+"px";
 
 			var iDivWidth = $(nHidden).outerWidth();
 			var iDivHeight = $(nHidden).outerHeight();
-			var iDocWidth = $(document).width();
 			
-			if ( iLeft + iDivWidth > iDocWidth )
+			if ( iDivX + iDivWidth > iDocWidth )
 			{
 				nHidden.style.left = (iDocWidth-iDivWidth)+"px";
 			}
 		}
 		
+		/* This results in a very small delay for the end user but it allows the animation to be
+		 * much smoother. If you don't want the animation, then the setTimeout can be removed
+		 */
+			$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
+			$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
+				/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
+				 * reflected. As such, we need to do it here, once it is visible. Unbelievable.
+				 */
+				if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
+				{
+					that._fnDrawCallback();
+				}
+			});
+		
 		this.s.hidden = false;
 	},
 	
@@ -978,7 +971,7 @@ ColVis.prototype.CLASS = "ColVis";
  *  @type      String
  *  @default   See code
  */
-ColVis.VERSION = "1.0.9.dev";
+ColVis.VERSION = "1.0.8";
 ColVis.prototype.VERSION = ColVis.VERSION;
 
 

From 8d7910beb24b002a220280e00801d01169616f04 Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Tue, 13 Nov 2012 15:11:51 -0600
Subject: [PATCH 2/3] accident...Revert "enable show/hide on serverside
 processing table columns without reloading"

This reverts commit e55841cbc8ee5879699f2d9078cb2ccd9f7a11ab.
---
 media/js/ColVis.js | 73 +++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/media/js/ColVis.js b/media/js/ColVis.js
index 06bcf98..b049e63 100755
--- a/media/js/ColVis.js
+++ b/media/js/ColVis.js
@@ -1,6 +1,6 @@
 /*
  * File:        ColVis.js
- * Version:     1.0.8
+ * Version:     1.0.9.dev
  * CVS:         $Id$
  * Description: Controls for column visiblity in DataTables
  * Author:      Allan Jardine (www.sprymedia.co.uk)
@@ -159,7 +159,7 @@ ColVis = function( oDTSettings, oInit )
 		 *  @type     Integer
 		 *  @default  500
 		 */
-		"iOverlayFade": 0,
+		"iOverlayFade": 500,
 		
 		/**
 		 * Label callback for column names. Takes three parameters: 1. the column index, 2. the column
@@ -610,15 +610,18 @@ ColVis.prototype = {
 			var oldIndex = $.fn.dataTableExt.iApiIndex;
 			$.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
 
-			that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
-			that.s.dt.oInstance.fnAdjustColumnSizing( false );
-
+			// Optimisation for server-side processing when scrolling - don't do a full redraw
 			if ( dt.oFeatures.bServerSide && (dt.oScroll.sX !== "" || dt.oScroll.sY !== "" ) )
 			{
-				that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );				
+				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();
+			}
+			else
+			{
+				that.s.dt.oInstance.fnSetColumnVis( i, showHide );
 			}
-			
-			that._fnDrawCallback();
 
 			$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */
 			
@@ -771,7 +774,7 @@ ColVis.prototype = {
 	 */
 	"_fnCollectionShow": function ()
 	{
-		var that = this, i, iLen;
+		var that = this, i, iLen, iLeft;
 		var oPos = $(this.dom.button).offset();
 		var nHidden = this.dom.collection;
 		var nBackground = this.dom.background;
@@ -783,14 +786,14 @@ ColVis.prototype = {
 			nHidden.style.top = iDivY+"px";
 			nHidden.style.left = iDivX+"px";
 		}
-		nHidden.style.display = "block";
-		$(nHidden).css('opacity',0);
 		
-		var iWinHeight = $(window).height(), iDocHeight = $(document).height(),
-		 	iWinWidth = $(window).width(), iDocWidth = $(document).width();
+		$(nHidden).css( {
+			'display': 'block',
+			'opacity': 0
+		} );
 		
-		nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px";
-		nBackground.style.width = ((iWinWidth<iDocWidth)? iWinWidth : iDocWidth) +"px";
+		nBackground.style.bottom ='0px';
+		nBackground.style.right = '0px';
 		
 		var oStyle = this.dom.catcher.style;
 		oStyle.height = $(this.dom.button).outerHeight()+"px";
@@ -826,35 +829,39 @@ ColVis.prototype = {
 			this.dom.collection.style.width = iMax+"px";
 		}
 		
+		/* This results in a very small delay for the end user but it allows the animation to be
+		 * much smoother. If you don't want the animation, then the setTimeout can be removed
+		 */
+		$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
+		$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
+			/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
+			 * reflected. As such, we need to do it here, once it is visible. Unbelievable.
+			 */
+			if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
+			{
+				that._fnDrawCallback();
+			}
+		});
+		
 		/* Visual corrections to try and keep the collection visible */
 		if ( !this.s.bCssPosition )
 		{
-			nHidden.style.left = this.s.sAlign=="left" ?
-				iDivX+"px" : (iDivX-$(nHidden).outerWidth()+$(this.dom.button).outerWidth())+"px";
+			iLeft = ( this.s.sAlign=="left" ) ?
+				iDivX :
+				iDivX - $(nHidden).outerWidth() + $(this.dom.button).outerWidth();
+
+			nHidden.style.left = iLeft+"px";
 
 			var iDivWidth = $(nHidden).outerWidth();
 			var iDivHeight = $(nHidden).outerHeight();
+			var iDocWidth = $(document).width();
 			
-			if ( iDivX + iDivWidth > iDocWidth )
+			if ( iLeft + iDivWidth > iDocWidth )
 			{
 				nHidden.style.left = (iDocWidth-iDivWidth)+"px";
 			}
 		}
 		
-		/* This results in a very small delay for the end user but it allows the animation to be
-		 * much smoother. If you don't want the animation, then the setTimeout can be removed
-		 */
-			$(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
-			$(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
-				/* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
-				 * reflected. As such, we need to do it here, once it is visible. Unbelievable.
-				 */
-				if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
-				{
-					that._fnDrawCallback();
-				}
-			});
-		
 		this.s.hidden = false;
 	},
 	
@@ -971,7 +978,7 @@ ColVis.prototype.CLASS = "ColVis";
  *  @type      String
  *  @default   See code
  */
-ColVis.VERSION = "1.0.8";
+ColVis.VERSION = "1.0.9.dev";
 ColVis.prototype.VERSION = ColVis.VERSION;
 
 

From 1bf09bff483cebc36e6be62bfb55a7ef1c48abc6 Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Tue, 13 Nov 2012 15:12:17 -0600
Subject: [PATCH 3/3] Improved serverside show/hide support. This commit
 prevents us from redrawing/refetching the data for every show and hide.

---
 media/js/ColVis.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/media/js/ColVis.js b/media/js/ColVis.js
index b049e63..6ce1ac5 100755
--- a/media/js/ColVis.js
+++ b/media/js/ColVis.js
@@ -611,17 +611,15 @@ ColVis.prototype = {
 			$.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
 
 			// Optimisation for server-side processing when scrolling - don't do a full redraw
+			that.s.dt.oInstance.fnSetColumnVis( i, showHide, false );
+			that.s.dt.oInstance.fnAdjustColumnSizing( false );
+
 			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();
-			}
-			else
-			{
-				that.s.dt.oInstance.fnSetColumnVis( i, showHide );
+				that.s.dt.oInstance.oApi._fnScrollDraw( that.s.dt );				
 			}
+			
+			that._fnDrawCallback();
 
 			$.fn.dataTableExt.iApiIndex = oldIndex; /* Restore */