From 12850f137f0c698b563277ef5349a225101ff520 Mon Sep 17 00:00:00 2001
From: Jeremy Hubble <jghubble@gmail.com>
Date: Mon, 8 Apr 2013 10:43:22 -0700
Subject: [PATCH 1/6] bugfixes and new options

1) Maintain "sort" option on each column before and after resize
2) Added options: minResizeWidth, bResizeTable, bAddFixed,
fnResizeTableCallback, bAddFixed
---
 media/js/ColReorderWithResize.js | 2764 +++++++++++++++++-------------
 1 file changed, 1579 insertions(+), 1185 deletions(-)

diff --git a/media/js/ColReorderWithResize.js b/media/js/ColReorderWithResize.js
index 8096aa0..3eb3a30 100644
--- a/media/js/ColReorderWithResize.js
+++ b/media/js/ColReorderWithResize.js
@@ -1,1194 +1,1588 @@
 /*
- * File:        ColReorderWithResize.js
- * Version:     1.0.5
- * CVS:         $Id$
- * Description: Controls for column visiblity in DataTables + Columns resizable by user
- * Author:      Allan Jardine (www.sprymedia.co.uk)
- * Author:      Christophe Battarel (www.altairis.fr)
- * Created:     Wed Sep 15 18:23:29 BST 2010
- * Modified:    July 2011 by Christophe Battarel - christophe.battarel@altairis.fr (columns resizable)
- * Modified:    February 2012 by Martin Marchetta - martin.marchetta@gmail.com
- *  1. Made the "hot area" for resizing a little wider (it was a little difficult to hit the exact border of a column for resizing)
- *  2. Resizing didn't work at all when using scroller (that plugin splits the table into 2 different tables: one for the header and another one for the body, so when you resized the header, the data columns didn't follow)
- *  3. Fixed collateral effects of sorting feature
- *  4. If sScrollX is enabled (i.e. horizontal scrolling), when resizing a column the width of the other columns is not changed, but the whole
- *     table is resized to give an Excel-like behavior (good suggestion by Allan)
- * Modified:    February 2012 by Christophe Battarel - christophe.battarel@altairis.fr (ColReorder v1.0.5 adaptation)
- * Language:    Javascript
- * License:     GPL v2 or BSD 3 point style
- * Project:     DataTables
- * Contact:     www.sprymedia.co.uk/contact
- * 
- * Copyright 2010-2011 Allan Jardine, all rights reserved.
- *
- * This source file is free software, under either the GPL v2 license or a
- * BSD style license, available at:
- *   http://datatables.net/license_gpl2
- *   http://datatables.net/license_bsd
- *
- */
-
-
-(function($, window, document) {
-
-
-/**
- * Switch the key value pairing of an index array to be value key (i.e. the old value is now the
- * key). For example consider [ 2, 0, 1 ] this would be returned as [ 1, 2, 0 ].
- *  @method  fnInvertKeyValues
- *  @param   array aIn Array to switch around
- *  @returns array
- */
-function fnInvertKeyValues( aIn )
-{
-	var aRet=[];
-	for ( var i=0, iLen=aIn.length ; i<iLen ; i++ )
-	{
-		aRet[ aIn[i] ] = i;
-	}
-	return aRet;
-}
-
-
-/**
- * Modify an array by switching the position of two elements
- *  @method  fnArraySwitch
- *  @param   array aArray Array to consider, will be modified by reference (i.e. no return)
- *  @param   int iFrom From point
- *  @param   int iTo Insert point
- *  @returns void
- */
-function fnArraySwitch( aArray, iFrom, iTo )
-{
-	var mStore = aArray.splice( iFrom, 1 )[0];
-	aArray.splice( iTo, 0, mStore );
-}
-
-
-/**
- * Switch the positions of nodes in a parent node (note this is specifically designed for 
- * table rows). Note this function considers all element nodes under the parent!
- *  @method  fnDomSwitch
- *  @param   string sTag Tag to consider
- *  @param   int iFrom Element to move
- *  @param   int Point to element the element to (before this point), can be null for append
- *  @returns void
- */
-function fnDomSwitch( nParent, iFrom, iTo )
-{
-	var anTags = [];
-	for ( var i=0, iLen=nParent.childNodes.length ; i<iLen ; i++ )
-	{
-		if ( nParent.childNodes[i].nodeType == 1 )
-		{
-			anTags.push( nParent.childNodes[i] );
-		}
-	}
-	var nStore = anTags[ iFrom ];
-	
-	if ( iTo !== null )
-	{
-		nParent.insertBefore( nStore, anTags[iTo] );
-	}
-	else
-	{
-		nParent.appendChild( nStore );
-	}
-}
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * DataTables plug-in API functions
- *
- * This are required by ColReorder in order to perform the tasks required, and also keep this
- * code portable, to be used for other column reordering projects with DataTables, if needed.
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-/**
- * Plug-in for DataTables which will reorder the internal column structure by taking the column
- * from one position (iFrom) and insert it into a given point (iTo).
- *  @method  $.fn.dataTableExt.oApi.fnColReorder
- *  @param   object oSettings DataTables settings object - automatically added by DataTables! 
- *  @param   int iFrom Take the column to be repositioned from this point
- *  @param   int iTo and insert it into this point
- *  @returns void
- */
-$.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo )
-{
-	var i, iLen, j, jLen, iCols=oSettings.aoColumns.length, nTrs, oCol;
-	
-	/* Sanity check in the input */
-	if ( iFrom == iTo )
-	{
-		/* Pointless reorder */
-		return;
-	}
-	
-	if ( iFrom < 0 || iFrom >= iCols )
-	{
-		this.oApi._fnLog( oSettings, 1, "ColReorder 'from' index is out of bounds: "+iFrom );
-		return;
-	}
-	
-	if ( iTo < 0 || iTo >= iCols )
-	{
-		this.oApi._fnLog( oSettings, 1, "ColReorder 'to' index is out of bounds: "+iTo );
-		return;
-	}
-	
-	/*
-	 * Calculate the new column array index, so we have a mapping between the old and new
-	 */
-	var aiMapping = [];
-	for ( i=0, iLen=iCols ; i<iLen ; i++ )
-	{
-		aiMapping[i] = i;
-	}
-	fnArraySwitch( aiMapping, iFrom, iTo );
-	var aiInvertMapping = fnInvertKeyValues( aiMapping );
-	
-	
-	/*
-	 * Convert all internal indexing to the new column order indexes
-	 */
-	/* Sorting */
-	for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
-	{
-		oSettings.aaSorting[i][0] = aiInvertMapping[ oSettings.aaSorting[i][0] ];
-	}
-	
-	/* Fixed sorting */
-	if ( oSettings.aaSortingFixed !== null )
-	{
-		for ( i=0, iLen=oSettings.aaSortingFixed.length ; i<iLen ; i++ )
-		{
-			oSettings.aaSortingFixed[i][0] = aiInvertMapping[ oSettings.aaSortingFixed[i][0] ];
-		}
-	}
-	
-	/* Data column sorting (the column which the sort for a given column should take place on) */
-	for ( i=0, iLen=iCols ; i<iLen ; i++ )
-	{
-		oCol = oSettings.aoColumns[i];
-		for ( j=0, jLen=oCol.aDataSort.length ; j<jLen ; j++ )
-		{
-			oCol.aDataSort[j] = aiInvertMapping[ oCol.aDataSort[j] ];
-		}
-	}
-	
-	/* Update the Get and Set functions for each column */
-	for ( i=0, iLen=iCols ; i<iLen ; i++ )
-	{
-		oCol = oSettings.aoColumns[i];
-		if ( typeof oCol.mDataProp == 'number' ) {
-			oCol.mDataProp = aiInvertMapping[ oCol.mDataProp ];
-			oCol.fnGetData = oSettings.oApi._fnGetObjectDataFn( oCol.mDataProp );
-			oCol.fnSetData = oSettings.oApi._fnSetObjectDataFn( oCol.mDataProp );
-		}
-	}
-	
-	
-	/*
-	 * Move the DOM elements
-	 */
-	if ( oSettings.aoColumns[iFrom].bVisible )
-	{
-		/* Calculate the current visible index and the point to insert the node before. The insert
-		 * before needs to take into account that there might not be an element to insert before,
-		 * in which case it will be null, and an appendChild should be used
-		 */
-		var iVisibleIndex = this.oApi._fnColumnIndexToVisible( oSettings, iFrom );
-		var iInsertBeforeIndex = null;
-		
-		i = iTo < iFrom ? iTo : iTo + 1;
-		while ( iInsertBeforeIndex === null && i < iCols )
-		{
-			iInsertBeforeIndex = this.oApi._fnColumnIndexToVisible( oSettings, i );
-			i++;
-		}
-		
-		/* Header */
-		nTrs = oSettings.nTHead.getElementsByTagName('tr');
-		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-		{
-			fnDomSwitch( nTrs[i], iVisibleIndex, iInsertBeforeIndex );
-		}
-		
-		/* Footer */
-		if ( oSettings.nTFoot !== null )
-		{
-			nTrs = oSettings.nTFoot.getElementsByTagName('tr');
-			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-			{
-				fnDomSwitch( nTrs[i], iVisibleIndex, iInsertBeforeIndex );
-			}
-		}
-		
-		/* Body */
-		for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-		{
-			if ( oSettings.aoData[i].nTr !== null )
-			{
-				fnDomSwitch( oSettings.aoData[i].nTr, iVisibleIndex, iInsertBeforeIndex );
-			}
-		}
-	}
-	
-	
-	/* 
-	 * Move the internal array elements
-	 */
-	/* Columns */
-	fnArraySwitch( oSettings.aoColumns, iFrom, iTo );
-	
-	/* Search columns */
-	fnArraySwitch( oSettings.aoPreSearchCols, iFrom, iTo );
-	
-	/* Array array - internal data anodes cache */
-	for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-	{
-		if ( $.isArray( oSettings.aoData[i]._aData ) ) {
-		  fnArraySwitch( oSettings.aoData[i]._aData, iFrom, iTo );
-		}
-		fnArraySwitch( oSettings.aoData[i]._anHidden, iFrom, iTo );
-	}
-	
-	/* Reposition the header elements in the header layout array */
-	for ( i=0, iLen=oSettings.aoHeader.length ; i<iLen ; i++ )
-	{
-		fnArraySwitch( oSettings.aoHeader[i], iFrom, iTo );
-	}
-	
-	if ( oSettings.aoFooter !== null )
-	{
-		for ( i=0, iLen=oSettings.aoFooter.length ; i<iLen ; i++ )
-		{
-			fnArraySwitch( oSettings.aoFooter[i], iFrom, iTo );
-		}
-	}
-	
-	
-	/*
-	 * Update DataTables' event handlers
-	 */
-	
-	/* Sort listener */
-	for ( i=0, iLen=iCols ; i<iLen ; i++ )
-	{
-		//Martin Marchetta: 
-		//Update this field which is the one used by DataTables for getting the column's data for sorting.
-		oSettings.aoColumns[i].aDataSort = [i];
-		//Update the internal column index, since columns are actually being re-ordered in the internal structure
-		oSettings.aoColumns[i]._ColReorder_iOrigCol = i;
-		///////////////////////////////////
-		$(oSettings.aoColumns[i].nTh).unbind('click');
-		this.oApi._fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
-	}
-	
-	
-	/*
-	 * Any extra operations for the other plug-ins
-	 */
-	if ( typeof ColVis != 'undefined' )
-	{
-		ColVis.fnRebuild( oSettings.oInstance );
-	}
-	
-	if ( typeof oSettings.oInstance._oPluginFixedHeader != 'undefined' )
-	{
-		oSettings.oInstance._oPluginFixedHeader.fnUpdate();
-	}
-};
-
-
-
-
-/** 
- * ColReorder provides column visiblity control for DataTables
- * @class ColReorder
- * @constructor
- * @param {object} DataTables object
- * @param {object} ColReorder options
- */
-ColReorder = function( oTable, oOpts )
-{
-	/* Santiy check that we are a new instance */
-	if ( !this.CLASS || this.CLASS != "ColReorder" )
-	{
-		alert( "Warning: ColReorder must be initialised with the keyword 'new'" );
-	}
-	
-	if ( typeof oOpts == 'undefined' )
-	{
-		oOpts = {};
-	}
-	
-	
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Public class variables
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-	
-	/**
-	 * @namespace Settings object which contains customisable information for ColReorder instance
-	 */
-	this.s = {
-		/**
-		 * DataTables settings object
-		 *  @property dt
-		 *  @type     Object
-		 *  @default  null
-		 */
-		"dt": null,
-		
-		/**
-		 * Initialisation object used for this instance
-		 *  @property init
-		 *  @type     object
-		 *  @default  {}
-		 */
-		"init": oOpts,
-		
-		/**
-		 * Allow Reorder functionnality
-		 *  @property allowReorder
-		 *  @type     boolean
-		 *  @default  true
-		 */
-		"allowReorder": true,
-		
-		/**
-		 * Allow Resize functionnality
-		 *  @property allowResize
-		 *  @type     boolean
-		 *  @default  true
-		 */
-		"allowResize": true,
-		
-		/**
-		 * Number of columns to fix (not allow to be reordered)
-		 *  @property fixed
-		 *  @type     int
-		 *  @default  0
-		 */
-		"fixed": 0,
-		
-		/**
-		 * Callback function for once the reorder has been done
-		 *  @property dropcallback
-		 *  @type     function
-		 *  @default  null
-		 */
-		"dropCallback": null,
-		
-		/**
-		 * @namespace Information used for the mouse drag
-		 */
-		"mouse": {
-			"startX": -1,
-			"startY": -1,
-			"offsetX": -1,
-			"offsetY": -1,
-			"target": -1,
-			"targetIndex": -1,
-			"fromIndex": -1
-		},
-		
-		/**
-		 * Information which is used for positioning the insert cusor and knowing where to do the
-		 * insert. Array of objects with the properties:
-		 *   x: x-axis position
-		 *   to: insert point
-		 *  @property aoTargets
-		 *  @type     array
-		 *  @default  []
-		 */
-		"aoTargets": []
-	};
-	
-	
-	/**
-	 * @namespace Common and useful DOM elements for the class instance
-	 */
-	this.dom = {
-		/**
-		 * Dragging element (the one the mouse is moving)
-		 *  @property drag
-		 *  @type     element
-		 *  @default  null
-		 */
-		"drag": null,
-
-		/**
-		 * Resizing a column
-		 *  @property drag
-		 *  @type     element
-		 *  @default  null
-		 */
-    "resize": null,
-		
-		/**
-		 * The insert cursor
-		 *  @property pointer
-		 *  @type     element
-		 *  @default  null
-		 */
-		"pointer": null
-	};
-
-	/////////////////
-	//Martin Marchetta: keep the current table's size in order to resize it if columns are resized and scrollX is enabled
-	this.table_size = -1;
-	/////////////////
-	
-	/* Constructor logic */
-	this.s.dt = oTable.fnSettings();
-	this._fnConstruct();
-	
-	/* Store the instance for later use */
-	ColReorder.aoInstances.push( this );
-	return this;
-};
-
-
-
-ColReorder.prototype = {
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Public methods
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-	
-	"fnReset": function ()
-	{
-		var a = [];
-		for ( var i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
-		{
-			a.push( this.s.dt.aoColumns[i]._ColReorder_iOrigCol );
-		}
-		
-		this._fnOrderColumns( a );
-	},
-	
-	
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Private methods (they are of course public in JS, but recommended as private)
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-	
-	/**
-	 * Constructor logic
-	 *  @method  _fnConstruct
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnConstruct": function ()
-	{
-		var that = this;
-		var i, iLen;
-		
-		/* allow reorder */
-		if ( typeof this.s.init.allowReorder != 'undefined' )
-		{
-			this.s.allowReorder = this.s.init.allowReorder;
-		}
-		
-		/* allow resize */
-		if ( typeof this.s.init.allowResize != 'undefined' )
-		{
-			this.s.allowResize = this.s.init.allowResize;
-		}
-		
-		/* Columns discounted from reordering - counting left to right */
-		if ( typeof this.s.init.iFixedColumns != 'undefined' )
-		{
-			this.s.fixed = this.s.init.iFixedColumns;
-		}
-		
-		/* Drop callback initialisation option */
-		if ( typeof this.s.init.fnReorderCallback != 'undefined' )
-		{
-			this.s.dropCallback = this.s.init.fnReorderCallback;
-		}
-		
-		/* Add event handlers for the drag and drop, and also mark the original column order */
-		for ( i=0, iLen=this.s.dt.aoColumns.length ; i<iLen ; i++ )
-		{
-			if ( i > this.s.fixed-1 )
-			{
-				this._fnMouseListener( i, this.s.dt.aoColumns[i].nTh );
-			}
-			
-			/* Mark the original column order for later reference */
-			this.s.dt.aoColumns[i]._ColReorder_iOrigCol = i;
-		}
-		
-		/* State saving */
-		this.s.dt.oApi._fnCallbackReg( this.s.dt, 'aoStateSaveParams', function (oS, oData) {
-			that._fnStateSave.call( that, oData );
-		}, "ColReorder_State" );
-		
-		/* An initial column order has been specified */
-		var aiOrder = null;
-		if ( typeof this.s.init.aiOrder != 'undefined' )
-		{
-			aiOrder = this.s.init.aiOrder.slice();
-		}
-		
-		/* State loading, overrides the column order given */
-		if ( this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColReorder != 'undefined' &&
-		  this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length )
-		{
-			aiOrder = this.s.dt.oLoadedState.ColReorder;
-		}
-		
-		/* If we have an order to apply - do so */
-		if ( aiOrder )
-		{
-			/* We might be called during or after the DataTables initialisation. If before, then we need
-			 * to wait until the draw is done, if after, then do what we need to do right away
-			 */
-			if ( !that.s.dt._bInitComplete )
-			{
-				var bDone = false;
-				this.s.dt.aoDrawCallback.push( {
-					"fn": function () {
-						if ( !that.s.dt._bInitComplete && !bDone )
-						{
-							bDone = true;
-							var resort = fnInvertKeyValues( aiOrder );
-							that._fnOrderColumns.call( that, resort );
-						}
-					},
-					"sName": "ColReorder_Pre"
-				} );
-			}
-			else
-			{
-				var resort = fnInvertKeyValues( aiOrder );
-				that._fnOrderColumns.call( that, resort );
-			}
-		}
-	},
-	
-	
-	/**
-	 * Set the column order from an array
-	 *  @method  _fnOrderColumns
-	 *  @param   array a An array of integers which dictate the column order that should be applied
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnOrderColumns": function ( a )
-	{
-		if ( a.length != this.s.dt.aoColumns.length )
-		{
-			this.s.dt.oInstance.oApi._fnLog( oDTSettings, 1, "ColReorder - array reorder does not "+
-			 	"match known number of columns. Skipping." );
-			return;
-		}
-		
-		for ( var i=0, iLen=a.length ; i<iLen ; i++ )
-		{
-			var currIndex = $.inArray( i, a );
-			if ( i != currIndex )
-			{
-				/* Reorder our switching array */
-				fnArraySwitch( a, currIndex, i );
-				
-				/* Do the column reorder in the table */
-				this.s.dt.oInstance.fnColReorder( currIndex, i );
-			}
-		}
-		
-		/* When scrolling we need to recalculate the column sizes to allow for the shift */
-		if ( this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "" )
-		{
-			this.s.dt.oInstance.fnAdjustColumnSizing();
-		}
-			
-		/* Save the state */
-		this.s.dt.oInstance.oApi._fnSaveState( this.s.dt );
-	},
-	
-	
-	/**
-	 * Because we change the indexes of columns in the table, relative to their starting point
-	 * we need to reorder the state columns to what they are at the starting point so we can
-	 * then rearrange them again on state load!
-	 *  @method  _fnStateSave
-	 *  @param   object oState DataTables state 
-	 *  @returns string JSON encoded cookie string for DataTables
-	 *  @private 
-	 */
-	"_fnStateSave": function ( oState )
-	{
-		var i, iLen, aCopy, iOrigColumn;
-		var oSettings = this.s.dt;
-
-		/* Sorting */
-		for ( i=0 ; i<oState.aaSorting.length ; i++ )
-		{
-			oState.aaSorting[i][0] = oSettings.aoColumns[ oState.aaSorting[i][0] ]._ColReorder_iOrigCol;
-		}
-
-		aSearchCopy = $.extend( true, [], oState.aoSearchCols );
-		oState.ColReorder = [];
-
-		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-		{
-			iOrigColumn = oSettings.aoColumns[i]._ColReorder_iOrigCol;
-
-			/* Column filter */
-			oState.aoSearchCols[ iOrigColumn ] = aSearchCopy[i];
-
-			/* Visibility */
-			oState.abVisCols[ iOrigColumn ] = oSettings.aoColumns[i].bVisible;
-		
-			/* Column reordering */
-			oState.ColReorder.push( iOrigColumn );
-		}
-	},
-	
-	
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Mouse drop and drag
-	 */
-	
-	/**
-	 * Add a mouse down listener to a particluar TH element
-	 *  @method  _fnMouseListener
-	 *  @param   int i Column index
-	 *  @param   element nTh TH element clicked on
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnMouseListener": function ( i, nTh )
-	{
-		var that = this;
-
-		//Martin Marchetta (rebind events since after column re-order they use wrong column indices)
-		$(nTh).unbind('mousemove.ColReorder');
-		$(nTh).unbind('mousedown.ColReorder');
-		////////////////
-
-    // listen to mousemove event for resize
-    if (this.s.allowResize) {
-  		$(nTh).bind( 'mousemove.ColReorder', function (e) {   
-      	if ( that.dom.drag === null && that.dom.resize === null)
-      	{                                               
-      		/* Store information about the mouse position */
-      		var nThTarget = e.target.nodeName == "TH" ? e.target : $(e.target).parents('TH')[0];
-      		var offset = $(nThTarget).offset();             
-      		var nLength = $(nThTarget).innerWidth();  
-      		                                               
-          /* are we on the col border (if so, resize col) */     
-          if (Math.abs(e.pageX - Math.round(offset.left + nLength)) <= 5)
-           {                                                       
-            $(nThTarget).css({'cursor': 'col-resize'});            
-          }
-          else                              
-            $(nThTarget).css({'cursor': 'pointer'});          
+* File:        ColReorderWithResize-1.1.0-dev2.js
+* Version:     1.1.0-dev2 (based on commit 2a6de4e884 done on Feb 22, 2013)
+* CVS:         $Id$
+* Description: Allow columns to be reordered in a DataTable
+* Author:      Allan Jardine (www.sprymedia.co.uk)
+* Created:     Wed Sep 15 18:23:29 BST 2010
+* Modified:    2013 feb 2013 by nlz242
+* Language:    Javascript
+* License:     GPL v2 or BSD 3 point style
+* Project:     DataTables
+* Contact:     www.sprymedia.co.uk/contact
+*
+* Copyright 2010-2013 Allan Jardine, all rights reserved.
+*
+* This source file is free software, under either the GPL v2 license or a
+* BSD style license, available at:
+*   http://datatables.net/license_gpl2
+*   http://datatables.net/license_bsd
+*
+* Minor bug fixes by Jeremy Hubble @jeremyhubble
+*/
+
+
+(function ($, window, document) {
+
+
+    /**
+    * Switch the key value pairing of an index array to be value key (i.e. the old value is now the
+    * key). For example consider [ 2, 0, 1 ] this would be returned as [ 1, 2, 0 ].
+    *  @method  fnInvertKeyValues
+    *  @param   array aIn Array to switch around
+    *  @returns array
+    */
+    function fnInvertKeyValues(aIn) {
+        var aRet = [];
+        for (var i = 0, iLen = aIn.length; i < iLen; i++) {
+            aRet[aIn[i]] = i;
         }
-  		} );
-		}
-    
-    // listen to mousedown event
-		$(nTh).bind( 'mousedown.ColReorder', function (e) {
-			that._fnMouseDown.call( that, e, nTh, i ); //Martin Marchetta: added the index of the column dragged or resized
-			return false;
-		} );
-	},
-	
-	
-	/**
-	 * Mouse down on a TH element in the table header
-	 *  @method  _fnMouseDown
-	 *  @param   event e Mouse event
-	 *  @param   element nTh TH element to be dragged
-	 *  @param 	 i The column that's resized/dragged
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnMouseDown": function ( e, nTh, i )
-	{
-		var
-			that = this,
-			aoColumns = this.s.dt.aoColumns;
-		
-    /* are we resizing a column ? */
-    if ($(nTh).css('cursor') == 'col-resize') {         
-      this.s.mouse.startX = e.pageX;
-      this.s.mouse.startWidth = $(nTh).width();
-      this.s.mouse.resizeElem = $(nTh); 
-      var nThNext = $(nTh).next();
-      this.s.mouse.nextStartWidth = $(nThNext).width();
-      that.dom.resize = true;
-		  ////////////////////
-		  //Martin Marchetta 
-		  //a. Disable column sorting so as to avoid issues when finishing column resizing
-		  this.s.dt.aoColumns[i].bSortable = false;
-		  //b. Disable Autowidth feature (now the user is in charge of setting column width so keeping this enabled looses changes after operations)
-		  this.s.dt.oFeatures.bAutoWidth = false;
-		  ////////////////////
+        return aRet;
     }
-    else if (this.s.allowReorder) {
-      that.dom.resize = null;
-  		/* Store information about the mouse position */
-  		var nThTarget = e.target.nodeName == "TH" ? e.target : $(e.target).parents('TH')[0];
-  		var offset = $(nThTarget).offset();
-  		this.s.mouse.startX = e.pageX;
-  		this.s.mouse.startY = e.pageY;
-  		this.s.mouse.offsetX = e.pageX - offset.left;
-  		this.s.mouse.offsetY = e.pageY - offset.top;
-  		this.s.mouse.target = nTh;
-  		this.s.mouse.targetIndex = $('th', nTh.parentNode).index( nTh );
-  		this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex( this.s.dt, 
-  			this.s.mouse.targetIndex );
-  		
-  		/* Calculate a cached array with the points of the column inserts, and the 'to' points */
-  		this.s.aoTargets.splice( 0, this.s.aoTargets.length );
-  		
-  		this.s.aoTargets.push( {
-  			"x":  $(this.s.dt.nTable).offset().left,
-  			"to": 0
-  		} );
-  		
-  		var iToPoint = 0;
-  		for ( var i=0, iLen=aoColumns.length ; i<iLen ; i++ )
-  		{
-  			/* For the column / header in question, we want it's position to remain the same if the 
-  			 * position is just to it's immediate left or right, so we only incremement the counter for
-  			 * other columns
-  			 */
-  			if ( i != this.s.mouse.fromIndex )
-  			{
-  				iToPoint++;
-  			}
-  			
-  			if ( aoColumns[i].bVisible )
-  			{
-  				this.s.aoTargets.push( {
-  					"x":  $(aoColumns[i].nTh).offset().left + $(aoColumns[i].nTh).outerWidth(),
-  					"to": iToPoint
-  				} );
-  			}
-  		}
-  		
-  		/* Disallow columns for being reordered by drag and drop, counting left to right */
-  		if ( this.s.fixed !== 0 )
-  		{
-  			this.s.aoTargets.splice( 0, this.s.fixed );
-  		}
+
+
+    /**
+    * Modify an array by switching the position of two elements
+    *  @method  fnArraySwitch
+    *  @param   array aArray Array to consider, will be modified by reference (i.e. no return)
+    *  @param   int iFrom From point
+    *  @param   int iTo Insert point
+    *  @returns void
+    */
+    function fnArraySwitch(aArray, iFrom, iTo) {
+        var mStore = aArray.splice(iFrom, 1)[0];
+        aArray.splice(iTo, 0, mStore);
     }
-    		
-		/* Add event handlers to the document */
-		$(document).bind( 'mousemove.ColReorder', function (e) {
-			that._fnMouseMove.call( that, e, i); //Martin Marchetta: Added index of the call being dragged or resized
-		} );
-		
-		$(document).bind( 'mouseup.ColReorder', function (e) {
-			//Martin Marcheta: Added this small delay in order to prevent collision with column sort feature (there must be a better
-			//way of doing this, but I don't have more time to digg into it)
-			setTimeout(function(){
-							that._fnMouseUp.call( that, e, i );  //Martin Marchetta: Added index of the call being dragged or resized
-						}, 10);
-		} );
-	},
-	
-	
-	/**
-	 * Deal with a mouse move event while dragging a node
-	 *  @method  _fnMouseMove
-	 *  @param   event e Mouse event
-	 *  @param   colResized Index of the column that's being dragged or resized (index within the internal model, not the visible order)
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnMouseMove": function ( e, colResized )
-	{
-		var that = this;
-		
-		////////////////////
-		//Martin Marchetta: Determine if ScrollX is enabled
-		var scrollXEnabled;
-		
-		scrollXEnabled = this.s.dt.oInit.sScrollX === "" ? false:true;
-	
-		//Keep the current table's width (used in case sScrollX is enabled to resize the whole table, giving an Excel-like behavior)
-		if(this.table_size < 0 && scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper) != undefined){
-			if($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
-				this.table_size = $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width();
-		}
-		////////////////////
-	
-		/* are we resizing a column ? */
-		if (this.dom.resize) {       
-		  var nTh = this.s.mouse.resizeElem;
-		  var nThNext = $(nTh).next();
-		  var moveLength = e.pageX-this.s.mouse.startX; 
-		  if (moveLength != 0 && !scrollXEnabled)
-			$(nThNext).width(this.s.mouse.nextStartWidth - moveLength);
-		  $(nTh).width(this.s.mouse.startWidth + moveLength);
-			  
-		  //Martin Marchetta: Resize the header too (if sScrollX is enabled)
-		  if(scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper) != undefined){
-			if($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
-				$($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width(this.table_size + moveLength);
-		  }
-			  
-		  ////////////////////////
-		  //Martin Marchetta: Fixed col resizing when the scroller is enabled.
-		  var visibleColumnIndex;
-		  //First determine if this plugin is being used along with the smart scroller...
-		  if($('div.dataTables_scrollBody') != null){
-			//...if so, when resizing the header, also resize the table's body (when enabling the Scroller, the table's header and
-			//body are split into different tables, so the column resizing doesn't work anymore)
-			if($('div.dataTables_scrollBody').length > 0){
-				//Since some columns might have been hidden, find the correct one to resize in the table's body
-				var currentColumnIndex;
-				visibleColumnIndex = -1;
-				for(currentColumnIndex=-1; currentColumnIndex < this.s.dt.aoColumns.length-1 && currentColumnIndex != colResized; currentColumnIndex++){
-					if(this.s.dt.aoColumns[currentColumnIndex+1].bVisible)
-						visibleColumnIndex++;
-				}
-
-				//Get the scroller's div
-				tableScroller = $('div.dataTables_scrollBody', this.s.dt.nTableWrapper)[0];
-				
-				//Get the table
-				scrollingTableHead = $(tableScroller)[0].childNodes[0].childNodes[0].childNodes[0];
-				
-				//Resize the columns
-				if (moveLength != 0 && !scrollXEnabled){
-					$($(scrollingTableHead)[0].childNodes[visibleColumnIndex+1]).width(this.s.mouse.nextStartWidth - moveLength);
-				}
-				$($(scrollingTableHead)[0].childNodes[visibleColumnIndex]).width(this.s.mouse.startWidth + moveLength);
-				
-				//Resize the table too
-				if(scrollXEnabled)
-					$($(tableScroller)[0].childNodes[0]).width(this.table_size + moveLength);
-			}
-		  }
-		  ////////////////////////
-			  
-		  return;
-		}
-		else if (this.s.allowReorder) {
-			if ( this.dom.drag === null )
-			{
-				/* Only create the drag element if the mouse has moved a specific distance from the start
-				 * point - this allows the user to make small mouse movements when sorting and not have a
-				 * possibly confusing drag element showing up
-				 */
-				if ( Math.pow(
-					Math.pow(e.pageX - this.s.mouse.startX, 2) + 
-					Math.pow(e.pageY - this.s.mouse.startY, 2), 0.5 ) < 5 )
-				{
-					return;
-				}
-				this._fnCreateDragNode();
-			}
-			
-			/* Position the element - we respect where in the element the click occured */
-			this.dom.drag.style.left = (e.pageX - this.s.mouse.offsetX) + "px";
-			this.dom.drag.style.top = (e.pageY - this.s.mouse.offsetY) + "px";
-			
-			/* Based on the current mouse position, calculate where the insert should go */
-			var bSet = false;
-			for ( var i=1, iLen=this.s.aoTargets.length ; i<iLen ; i++ )
-			{
-				if ( e.pageX < this.s.aoTargets[i-1].x + ((this.s.aoTargets[i].x-this.s.aoTargets[i-1].x)/2) )
-				{
-					this.dom.pointer.style.left = this.s.aoTargets[i-1].x +"px";
-					this.s.mouse.toIndex = this.s.aoTargets[i-1].to;
-					bSet = true;
-					break;
-				}
-			}
-			
-			/* The insert element wasn't positioned in the array (less than operator), so we put it at 
-			 * the end
-			 */
-			if ( !bSet )
-			{
-				this.dom.pointer.style.left = this.s.aoTargets[this.s.aoTargets.length-1].x +"px";
-				this.s.mouse.toIndex = this.s.aoTargets[this.s.aoTargets.length-1].to;
-			}
-		}
-	},
-	
-	
-	/**
-	 * Finish off the mouse drag and insert the column where needed
-	 *  @method  _fnMouseUp
-	 *  @param   event e Mouse event
-	 *  @param colResized The index of the column that was just dragged or resized (index within the internal model, not the visible order).
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnMouseUp": function ( e, colResized)
-	{
-		var that = this;
-		
-		$(document).unbind( 'mousemove.ColReorder' );
-		$(document).unbind( 'mouseup.ColReorder' );
-
-		if ( this.dom.drag !== null )
-		{
-			/* Remove the guide elements */
-			document.body.removeChild( this.dom.drag );
-			document.body.removeChild( this.dom.pointer );
-			this.dom.drag = null;
-			this.dom.pointer = null;
-			
-			/* Actually do the reorder */
-			this.s.dt.oInstance.fnColReorder( this.s.mouse.fromIndex, this.s.mouse.toIndex );
-			
-			/* When scrolling we need to recalculate the column sizes to allow for the shift */
-			if ( this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "" )
-			{
-				this.s.dt.oInstance.fnAdjustColumnSizing();
-			}
-			
-			if ( this.s.dropCallback !== null )
-			{
-				this.s.dropCallback.call( this );
-			}
-
-			////////////
-			//Martin Marchetta: Re-initialize so as to register the new column order 
-			//(otherwise the events remain bound to the original column indices)
-			this._fnConstruct();
-			///////////
-			
-			/* Save the state */
-			this.s.dt.oInstance.oApi._fnSaveState( this.s.dt );
-		}
-		///////////////////////////////////////////////////////
-		//Martin Marchetta
-		else if(this.dom.resize !== null) {
-			var i;
-			var j;
-			var currentColumn;
-			var nextVisibleColumnIndex;
-			var previousVisibleColumnIndex;
-			var scrollXEnabled;
-			
-			//Re-enable column sorting
-			this.s.dt.aoColumns[colResized].bSortable = true;
-			
-			//Save the new resized column's width
-			this.s.dt.aoColumns[colResized].sWidth = $(this.s.mouse.resizeElem).innerWidth() + "px";
-			
-			//If other columns might have changed their size, save their size too
-			scrollXEnabled = this.s.dt.oInit.sScrollX === "" ? false:true;			
-			if(!scrollXEnabled){
-				//The colResized index (internal model) here might not match the visible index since some columns might have been hidden
-				for(nextVisibleColumnIndex=colResized+1; nextVisibleColumnIndex < this.s.dt.aoColumns.length; nextVisibleColumnIndex++){
-					if(this.s.dt.aoColumns[nextVisibleColumnIndex].bVisible)
-						break;
-				}
-
-				for(previousVisibleColumnIndex=colResized-1; previousVisibleColumnIndex >= 0; previousVisibleColumnIndex--){
-					if(this.s.dt.aoColumns[previousVisibleColumnIndex].bVisible)
-						break;
-				}
-				
-				if(this.s.dt.aoColumns.length > nextVisibleColumnIndex)
-					this.s.dt.aoColumns[nextVisibleColumnIndex].sWidth = $(this.s.mouse.resizeElem).next().innerWidth() + "px";
-				else{ //The column resized is the right-most, so save the sizes of all the columns at the left
-					currentColumn = this.s.mouse.resizeElem;
-					for(i = previousVisibleColumnIndex; i > 0; i--){
-						if(this.s.dt.aoColumns[i].bVisible){
-							currentColumn = $(currentColumn).prev();
-							this.s.dt.aoColumns[i].sWidth = $(currentColumn).innerWidth() + "px";
-						}
-					}
-				}
-			}			
-			
-			//Update the internal storage of the table's width (in case we changed it because the user resized some column and scrollX was enabled
-			if(scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper) != undefined){
-				if($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
-					this.table_size = $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width();
-			}
-			
-			//Save the state
-			this.s.dt.oInstance.oApi._fnSaveState( this.s.dt );
-		}
-		///////////////////////////////////////////////////////
-		
-		this.dom.resize = null;
-	},
-	
-	
-	/**
-	 * Copy the TH element that is being drags so the user has the idea that they are actually 
-	 * moving it around the page.
-	 *  @method  _fnCreateDragNode
-	 *  @returns void
-	 *  @private 
-	 */
-	"_fnCreateDragNode": function ()
-	{
-		var that = this;
-		
-		this.dom.drag = $(this.s.dt.nTHead.parentNode).clone(true)[0];
-		this.dom.drag.className += " DTCR_clonedTable";
-		while ( this.dom.drag.getElementsByTagName('caption').length > 0 )
-		{
-			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('caption')[0] );
-		}
-		while ( this.dom.drag.getElementsByTagName('tbody').length > 0 )
-		{
-			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tbody')[0] );
-		}
-		while ( this.dom.drag.getElementsByTagName('tfoot').length > 0 )
-		{
-			this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tfoot')[0] );
-		}
-		
-		$('thead tr:eq(0)', this.dom.drag).each( function () {
-			$('th:not(:eq('+that.s.mouse.targetIndex+'))', this).remove();
-		} );
-		$('tr', this.dom.drag).height( $('tr:eq(0)', that.s.dt.nTHead).height() );
-		
-		$('thead tr:gt(0)', this.dom.drag).remove();
-		
-		$('thead th:eq(0)', this.dom.drag).each( function (i) {
-			this.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).width()+"px";
-		} );
-		
-		this.dom.drag.style.position = "absolute";
-		this.dom.drag.style.zIndex = 1200;
-		this.dom.drag.style.top = "0px";
-		this.dom.drag.style.left = "0px";
-		this.dom.drag.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).outerWidth()+"px";
-		
-		
-		this.dom.pointer = document.createElement( 'div' );
-		this.dom.pointer.className = "DTCR_pointer";
-		this.dom.pointer.style.position = "absolute";
-		
-		if ( this.s.dt.oScroll.sX === "" && this.s.dt.oScroll.sY === "" )
-		{
-			this.dom.pointer.style.top = $(this.s.dt.nTable).offset().top+"px";
-			this.dom.pointer.style.height = $(this.s.dt.nTable).height()+"px";
-		}
-		else
-		{
-			this.dom.pointer.style.top = $('div.dataTables_scroll', this.s.dt.nTableWrapper).offset().top+"px";
-			this.dom.pointer.style.height = $('div.dataTables_scroll', this.s.dt.nTableWrapper).height()+"px";
-		}
-	
-		document.body.appendChild( this.dom.pointer );
-		document.body.appendChild( this.dom.drag );
-	}
-};
-
-
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Static parameters
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Array of all ColReorder instances for later reference
- *  @property ColReorder.aoInstances
- *  @type     array
- *  @default  []
- *  @static
- */
-ColReorder.aoInstances = [];
-
-
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Static functions
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Reset the column ordering for a DataTables instance
- *  @method  ColReorder.fnReset
- *  @param   object oTable DataTables instance to consider
- *  @returns void
- *  @static
- */
-ColReorder.fnReset = function ( oTable )
-{
-	for ( var i=0, iLen=ColReorder.aoInstances.length ; i<iLen ; i++ )
-	{
-		if ( ColReorder.aoInstances[i].s.dt.oInstance == oTable )
-		{
-			ColReorder.aoInstances[i].fnReset();
-		}
-	}
-};
-
-
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Constants
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Name of this class
- *  @constant CLASS
- *  @type     String
- *  @default  ColReorder
- */
-ColReorder.prototype.CLASS = "ColReorder";
-
-
-/**
- * ColReorder version
- *  @constant  VERSION
- *  @type      String
- *  @default   As code
- */
-ColReorder.VERSION = "1.0.5";
-ColReorder.prototype.VERSION = ColReorder.VERSION;
-
-
 
 
+    /**
+    * Switch the positions of nodes in a parent node (note this is specifically designed for
+    * table rows). Note this function considers all element nodes under the parent!
+    *  @method  fnDomSwitch
+    *  @param   string sTag Tag to consider
+    *  @param   int iFrom Element to move
+    *  @param   int Point to element the element to (before this point), can be null for append
+    *  @returns void
+    */
+    function fnDomSwitch(nParent, iFrom, iTo) {
+        var anTags = [];
+        for (var i = 0, iLen = nParent.childNodes.length; i < iLen; i++) {
+            if (nParent.childNodes[i].nodeType == 1) {
+                anTags.push(nParent.childNodes[i]);
+            }
+        }
+        var nStore = anTags[iFrom];
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Initialisation
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+        if (iTo !== null) {
+            nParent.insertBefore(nStore, anTags[iTo]);
+        }
+        else {
+            nParent.appendChild(nStore);
+        }
+    }
 
-/*
- * Register a new feature with DataTables
- */
-if ( typeof $.fn.dataTable == "function" &&
+
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+    * DataTables plug-in API functions
+    *
+    * This are required by ColReorder in order to perform the tasks required, and also keep this
+    * code portable, to be used for other column reordering projects with DataTables, if needed.
+    * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+    /**
+    * Plug-in for DataTables which will reorder the internal column structure by taking the column
+    * from one position (iFrom) and insert it into a given point (iTo).
+    *  @method  $.fn.dataTableExt.oApi.fnColReorder
+    *  @param   object oSettings DataTables settings object - automatically added by DataTables!
+    *  @param   int iFrom Take the column to be repositioned from this point
+    *  @param   int iTo and insert it into this point
+    *  @returns void
+    */
+    $.fn.dataTableExt.oApi.fnColReorder = function (oSettings, iFrom, iTo) {
+        var i, iLen, j, jLen, iCols = oSettings.aoColumns.length, nTrs, oCol;
+
+        /* Sanity check in the input */
+        if (iFrom == iTo) {
+            /* Pointless reorder */
+            return;
+        }
+
+        if (iFrom < 0 || iFrom >= iCols) {
+            this.oApi._fnLog(oSettings, 1, "ColReorder 'from' index is out of bounds: " + iFrom);
+            return;
+        }
+
+        if (iTo < 0 || iTo >= iCols) {
+            this.oApi._fnLog(oSettings, 1, "ColReorder 'to' index is out of bounds: " + iTo);
+            return;
+        }
+
+        /*
+        * Calculate the new column array index, so we have a mapping between the old and new
+        */
+        var aiMapping = [];
+        for (i = 0, iLen = iCols; i < iLen; i++) {
+            aiMapping[i] = i;
+        }
+        fnArraySwitch(aiMapping, iFrom, iTo);
+        var aiInvertMapping = fnInvertKeyValues(aiMapping);
+
+
+        /*
+        * Convert all internal indexing to the new column order indexes
+        */
+        /* Sorting */
+        for (i = 0, iLen = oSettings.aaSorting.length; i < iLen; i++) {
+            oSettings.aaSorting[i][0] = aiInvertMapping[oSettings.aaSorting[i][0]];
+        }
+
+        /* Fixed sorting */
+        if (oSettings.aaSortingFixed !== null) {
+            for (i = 0, iLen = oSettings.aaSortingFixed.length; i < iLen; i++) {
+                oSettings.aaSortingFixed[i][0] = aiInvertMapping[oSettings.aaSortingFixed[i][0]];
+            }
+        }
+
+        /* Data column sorting (the column which the sort for a given column should take place on) */
+        for (i = 0, iLen = iCols; i < iLen; i++) {
+            oCol = oSettings.aoColumns[i];
+            for (j = 0, jLen = oCol.aDataSort.length; j < jLen; j++) {
+                oCol.aDataSort[j] = aiInvertMapping[oCol.aDataSort[j]];
+            }
+        }
+
+
+        /*
+        * Move the DOM elements
+        */
+        if (oSettings.aoColumns[iFrom].bVisible) {
+            /* Calculate the current visible index and the point to insert the node before. The insert
+            * before needs to take into account that there might not be an element to insert before,
+            * in which case it will be null, and an appendChild should be used
+            */
+            var iVisibleIndex = this.oApi._fnColumnIndexToVisible(oSettings, iFrom);
+            var iInsertBeforeIndex = null;
+
+            i = iTo < iFrom ? iTo : iTo + 1;
+            while (iInsertBeforeIndex === null && i < iCols) {
+                iInsertBeforeIndex = this.oApi._fnColumnIndexToVisible(oSettings, i);
+                i++;
+            }
+
+            /* Header */
+            nTrs = oSettings.nTHead.getElementsByTagName('tr');
+            for (i = 0, iLen = nTrs.length; i < iLen; i++) {
+                fnDomSwitch(nTrs[i], iVisibleIndex, iInsertBeforeIndex);
+            }
+
+            /* Footer */
+            if (oSettings.nTFoot !== null) {
+                nTrs = oSettings.nTFoot.getElementsByTagName('tr');
+                for (i = 0, iLen = nTrs.length; i < iLen; i++) {
+                    fnDomSwitch(nTrs[i], iVisibleIndex, iInsertBeforeIndex);
+                }
+            }
+
+            /* Body */
+            for (i = 0, iLen = oSettings.aoData.length; i < iLen; i++) {
+                if (oSettings.aoData[i].nTr !== null) {
+                    fnDomSwitch(oSettings.aoData[i].nTr, iVisibleIndex, iInsertBeforeIndex);
+                }
+            }
+        }
+
+
+        /*
+        * Move the internal array elements
+        */
+        /* Columns */
+        fnArraySwitch(oSettings.aoColumns, iFrom, iTo);
+
+        /* Search columns */
+        fnArraySwitch(oSettings.aoPreSearchCols, iFrom, iTo);
+
+        /* Array array - internal data anodes cache */
+        for (i = 0, iLen = oSettings.aoData.length; i < iLen; i++) {
+            fnArraySwitch(oSettings.aoData[i]._anHidden, iFrom, iTo);
+        }
+
+        /* Reposition the header elements in the header layout array */
+        for (i = 0, iLen = oSettings.aoHeader.length; i < iLen; i++) {
+            fnArraySwitch(oSettings.aoHeader[i], iFrom, iTo);
+        }
+
+        if (oSettings.aoFooter !== null) {
+            for (i = 0, iLen = oSettings.aoFooter.length; i < iLen; i++) {
+                fnArraySwitch(oSettings.aoFooter[i], iFrom, iTo);
+            }
+        }
+
+
+        /*
+        * Update DataTables' event handlers
+        */
+
+        /* Sort listener */
+        for (i = 0, iLen = iCols; i < iLen; i++) {
+            $(oSettings.aoColumns[i].nTh).off('click');
+            this.oApi._fnSortAttachListener(oSettings, oSettings.aoColumns[i].nTh, i);
+        }
+
+
+        /* 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') {
+            oSettings.oInstance._oPluginFixedHeader.fnUpdate();
+        }
+    };
+
+
+
+
+    /**
+    * ColReorder provides column visibility control for DataTables
+    * @class ColReorder
+    * @constructor
+    * @param {object} dt DataTables settings object
+    * @param {object} opts ColReorder options
+    */
+    var ColReorder = function (dt, opts) {
+        var oDTSettings;
+
+        // @todo - This should really be a static method offered by DataTables
+        if (dt.fnSettings) {
+            // DataTables object, convert to the settings object
+            oDTSettings = dt.fnSettings();
+        }
+        else if (typeof dt === 'string') {
+            // jQuery selector
+            if ($.fn.dataTable.fnIsDataTable($(dt)[0])) {
+                oDTSettings = $(dt).eq(0).dataTable().fnSettings();
+            }
+        }
+        else if (dt.nodeName && dt.nodeName.toLowerCase() === 'table') {
+            // Table node
+            if ($.fn.dataTable.fnIsDataTable(dt.nodeName)) {
+                oDTSettings = $(dt.nodeName).dataTable().fnSettings();
+            }
+        }
+        else if (dt instanceof jQuery) {
+            // jQuery object
+            if ($.fn.dataTable.fnIsDataTable(dt[0])) {
+                oDTSettings = dt.eq(0).dataTable().fnSettings();
+            }
+        }
+        else {
+            // DataTables settings object
+            oDTSettings = dt;
+        }
+
+        if (this instanceof ColReorder === false) {
+            // Get a ColReorder instance - effectively a static method
+            for (var i = 0, iLen = ColReorder.aoInstances.length; i < iLen; i++) {
+                if (ColReorder.aoInstances[i].s.dt == oDTSettings) {
+                    return ColReorder.aoInstances[i];
+                }
+            }
+
+            return null;
+        }
+
+
+        /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Public class variables
+        * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+        /**
+        * @namespace Settings object which contains customisable information for ColReorder instance
+        */
+        this.s = {
+            /**
+            * DataTables settings object
+            *  @property dt
+            *  @type     Object
+            *  @default  null
+            */
+            "dt": null,
+
+            /**
+            * Initialisation object used for this instance
+            *  @property init
+            *  @type     object
+            *  @default  {}
+            */
+            "init": $.extend(true, {}, ColReorder.defaults, opts),
+
+            /**
+            * Allow Reorder functionnality
+            *  @property allowReorder
+            *  @type     boolean
+            *  @default  true
+            */
+            "allowReorder": true,
+
+            /**
+            * Expand or collapse columns based on header double clicks
+            *  @property allowHeaderDoubleClick
+            *  @type     boolean
+            *  @default  true
+            */
+            "allowHeaderDoubleClick": true,
+
+
+            /**
+            * Allow Resize functionnality
+            *  @property allowResize
+            *  @type     boolean
+            *  @default  true
+            */
+            "allowResize": true,
+
+            /**
+            * Number of columns to fix (not allow to be reordered)
+            *  @property fixed
+            *  @type     int
+            *  @default  0
+            */
+            "fixed": 0,
+
+            /**
+            * Number of columns to fix counting from right (not allow to be reordered)
+            *  @property fixedRight
+            *  @type     int
+            *  @default  0
+            */
+            "fixedRight": 0,
+
+            /**
+            * Callback function for once the reorder has been done
+            *  @property dropcallback
+            *  @type     function
+            *  @default  null
+            */
+            "dropCallback": null,
+
+            /**
+            * @namespace Information used for the mouse drag
+            */
+            "mouse": {
+                "startX": -1,
+                "startY": -1,
+                "offsetX": -1,
+                "offsetY": -1,
+                "target": -1,
+                "targetIndex": -1,
+                "fromIndex": -1
+            },
+
+            /**
+            * Information which is used for positioning the insert cusor and knowing where to do the
+            * insert. Array of objects with the properties:
+            *   x: x-axis position
+            *   to: insert point
+            *  @property aoTargets
+            *  @type     array
+            *  @default  []
+            */
+            "aoTargets": [],
+
+            /**
+            * Minimum width for columns (in pixels)
+            * Default is 10. If set to 0, columns can be resized to nothingness.
+            * @property minResizeWidth
+            * @type     integer
+            * @default  10
+            */
+            "minResizeWidth": 10,
+
+            /**
+            * Resize the table when columns are resized
+            * @property bResizeTable
+            * @type     bolean
+            * @default  true
+            */
+            "bResizeTable": true,
+
+
+            /**
+            * Callback called after each time the table is resized
+            * This could be multiple times on one mouse move.
+            * useful for resizing a containing element.
+            * Passed the table element, new size, and the size change
+            * @property fnResizeTableCallback
+            * @type     function
+            * @default  function(table, newSize, sizeChange) {}
+            */
+            "fnbResizeTableCallback": function(){},
+
+            /**
+            * Add table-layout:fixed css to the table
+            * This header is required for column resize to function properly
+            * However, in some cases, you may want to do additional processing, and thus not set the header
+            * (For example, you may want the headers to be layed out normally, and then fix the table
+            *  after the headers are allocated their full space. In this case, you can manually add the css
+            *  in fnHeaderCallback and set bAddFixed to false here)
+            * @property bAddFixed
+            * @type     bolean
+            * @default  true
+            */
+            "bAddFixed": true
+        };
+
+
+        /**
+        * @namespace Common and useful DOM elements for the class instance
+        */
+        this.dom = {
+            /**
+            * Dragging element (the one the mouse is moving)
+            *  @property drag
+            *  @type     element
+            *  @default  null
+            */
+            "drag": null,
+
+            /**
+            * Resizing a column
+            *  @property drag
+            *  @type     element
+            *  @default  null
+            */
+            "resize": null,
+
+            /**
+            * The insert cursor
+            *  @property pointer
+            *  @type     element
+            *  @default  null
+            */
+            "pointer": null
+        };
+
+        this.table_size = -1;
+
+        /* Constructor logic */
+        this.s.dt = oDTSettings.oInstance.fnSettings();
+        this._fnConstruct();
+
+        /* Add destroy callback */
+        oDTSettings.oApi._fnCallbackReg(oDTSettings, 'aoDestroyCallback', $.proxy(this._fnDestroy, this), 'ColReorder');
+
+        /* Store the instance for later use */
+        ColReorder.aoInstances.push(this);
+
+
+        // fix the width and add table layout fixed. 
+        if (this.s.bAddFixed) {
+            $(this.s.dt.nTable).width($(this.s.dt.nTable).width()).css('table-layout','fixed');
+        }
+        return this;
+    };
+
+
+
+    ColReorder.prototype = {
+        /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Public methods
+        * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+        /**
+        * Reset the column ordering to the original ordering that was detected on
+        * start up.
+        *  @return {this} Returns `this` for chaining.
+        *
+        *  @example
+        *    // DataTables initialisation with ColReorder
+        *    var table = $('#example').dataTable( {
+        *        "sDom": 'Rlfrtip'
+        *    } );
+        *
+        *    // Add click event to a button to reset the ordering
+        *    $('#resetOrdering').click( function (e) {
+        *        e.preventDefault();
+        *        $.fn.dataTable.ColReorder( table ).fnReset();
+        *    } );
+        */
+        "fnReset": function () {
+            var a = [];
+            for (var i = 0, iLen = this.s.dt.aoColumns.length; i < iLen; i++) {
+                a.push(this.s.dt.aoColumns[i]._ColReorder_iOrigCol);
+            }
+
+            this._fnOrderColumns(a);
+
+            return this;
+        },
+
+        /**
+        * `Deprecated` - Get the current order of the columns, as an array.
+        *  @return {array} Array of column identifiers
+        *  @deprecated `fnOrder` should be used in preference to this method.
+        *      `fnOrder` acts as a getter/setter.
+        */
+        "fnGetCurrentOrder": function () {
+            return this.fnOrder();
+        },
+
+        /**
+        * Get the current order of the columns, as an array. Note that the values
+        * given in the array are unique identifiers for each column. Currently
+        * these are the original ordering of the columns that was detected on
+        * start up, but this could potentially change in future.
+        *  @return {array} Array of column identifiers
+        *
+        *  @example
+        *    // Get column ordering for the table
+        *    var order = $.fn.dataTable.ColReorder( dataTable ).fnOrder();
+        */
+        /**
+        * Set the order of the columns, from the positions identified in the
+        * ordering array given. Note that ColReorder takes a brute force approach
+        * to reordering, so it is possible multiple reordering events will occur
+        * before the final order is settled upon.
+        *  @param {array} [set] Array of column identifiers in the new order. Note
+        *    that every column must be included, uniquely, in this array.
+        *  @return {this} Returns `this` for chaining.
+        *
+        *  @example
+        *    // Swap the first and second columns
+        *    $.fn.dataTable.ColReorder( dataTable ).fnOrder( [1, 0, 2, 3, 4] );
+        *
+        *  @example
+        *    // Move the first column to the end for the table `#example`
+        *    var curr = $.fn.dataTable.ColReorder( '#example' ).fnOrder();
+        *    var first = curr.shift();
+        *    curr.push( first );
+        *    $.fn.dataTable.ColReorder( '#example' ).fnOrder( curr );
+        *
+        *  @example
+        *    // Reverse the table's order
+        *    $.fn.dataTable.ColReorder( '#example' ).fnOrder(
+        *      $.fn.dataTable.ColReorder( '#example' ).fnOrder().reverse()
+        *    );
+        */
+        "fnOrder": function (set) {
+            if (set === undefined) {
+                var a = [];
+                for (var i = 0, iLen = this.s.dt.aoColumns.length; i < iLen; i++) {
+                    a.push(this.s.dt.aoColumns[i]._ColReorder_iOrigCol);
+                }
+                return a;
+            }
+
+            this._fnOrderColumns(fnInvertKeyValues(set));
+
+            return this;
+        },
+
+
+        /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Private methods (they are of course public in JS, but recommended as private)
+        * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+        /**
+        * Constructor logic
+        *  @method  _fnConstruct
+        *  @returns void
+        *  @private
+        */
+        "_fnConstruct": function () {
+            var that = this;
+            var iLen = this.s.dt.aoColumns.length;
+            var i;
+
+            /* Columns discounted from reordering - counting left to right */
+            if (this.s.init.iFixedColumns) {
+                this.s.fixed = this.s.init.iFixedColumns;
+            }
+
+            /* Columns discounted from reordering - counting right to left */
+            this.s.fixedRight = this.s.init.iFixedColumnsRight ?
+         this.s.init.iFixedColumnsRight :
+         0;
+
+            /* Drop callback initialisation option */
+            if (this.s.init.fnReorderCallback) {
+                this.s.dropCallback = this.s.init.fnReorderCallback;
+            }
+
+            /* Allow reorder */
+            if (typeof this.s.init.allowReorder != 'undefined') {
+                this.s.allowReorder = this.s.init.allowReorder;
+            }
+
+            /* Allow resize */
+            if (typeof this.s.init.allowResize != 'undefined') {
+                this.s.allowResize = this.s.init.allowResize;
+            }
+
+            /* Allow header double click */
+            if (typeof this.s.init.allowHeaderDoubleClick != 'undefined') {
+                this.s.allowHeaderDoubleClick = this.s.init.allowHeaderDoubleClick;
+            }
+
+            if (typeof this.s.init.minResizeWidth != 'undefined') {
+                this.s.minResizeWidth = this.s.init.minResizeWidth;
+            }
+
+            if (typeof this.s.init.bResizeTable != 'undefined') {
+                this.s.bResizeTable = this.s.init.bResizeTable;
+            }
+
+            if (typeof this.s.init.bAddFixed != 'undefined') {
+                this.s.bAddFixed = this.s.init.bAddFixed;
+            }
+
+            if (typeof this.s.init.fnResizeTableCallback == 'function') {
+                this.s.fnResizeTableCallback = this.s.init.fnResizeTableCallback;
+            }
+
+            /* Add event handlers for the drag and drop, and also mark the original column order */
+            for (i = 0; i < iLen; i++) {
+                if (i > this.s.fixed - 1 && i < iLen - this.s.fixedRight) {
+                    this._fnMouseListener(i, this.s.dt.aoColumns[i].nTh);
+                }
+
+                /* Mark the original column order for later reference */
+                this.s.dt.aoColumns[i]._ColReorder_iOrigCol = i;
+            }
+
+            /* State saving */
+            this.s.dt.oApi._fnCallbackReg(this.s.dt, 'aoStateSaveParams', function (oS, oData) {
+                that._fnStateSave.call(that, oData);
+            }, "ColReorder_State");
+
+            /* An initial column order has been specified */
+            var aiOrder = null;
+            if (this.s.init.aiOrder) {
+                aiOrder = this.s.init.aiOrder.slice();
+            }
+
+            /* State loading, overrides the column order given */
+            if (this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColReorder != 'undefined' &&
+        this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length) {
+                aiOrder = this.s.dt.oLoadedState.ColReorder;
+            }
+
+            /* Load Column Sizes */
+            var asSizes = null;
+            if (this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColSizes != 'undefined' &&
+        this.s.dt.oLoadedState.ColSizes.length == this.s.dt.aoColumns.length) {
+                asSizes = this.s.dt.oLoadedState.ColSizes;
+            }
+
+            if (asSizes) {
+                // Apply the sizes to the column sWidth settings
+                for (i = 0, iLen = this.s.dt.aoColumns.length; i < iLen; i++)
+                    this.s.dt.aoColumns[i].sWidth = asSizes[i];
+            }
+
+            /* If we have an order and/or sizing to apply - do so */
+            if (aiOrder || asSizes) {
+                /* We might be called during or after the DataTables initialisation. If before, then we need
+                * to wait until the draw is done, if after, then do what we need to do right away
+                */
+                if (!that.s.dt._bInitComplete) {
+                    var bDone = false;
+                    this.s.dt.aoDrawCallback.push({
+                        "fn": function () {
+                            if (!that.s.dt._bInitComplete && !bDone) {
+                                bDone = true;
+                                if (aiOrder) {
+                                    var resort = fnInvertKeyValues(aiOrder);
+                                    that._fnOrderColumns.call(that, resort);
+                                }
+                                if (asSizes)
+                                    that._fnResizeColumns.call(that);
+                            }
+                        },
+                        "sName": "ColReorder_Pre"
+                    });
+                }
+                else {
+                    if (aiOrder) {
+                        var resort = fnInvertKeyValues(aiOrder);
+                        that._fnOrderColumns.call(that, resort);
+                    }
+                    if (asSizes)
+                        that._fnResizeColumns.call(that);
+                }
+            }
+        },
+
+        /**
+        * Set the column sizes (widths) from an array
+        *  @method  _fnResizeColumns
+        *  @returns void
+        *  @private 
+        */
+        "_fnResizeColumns": function () {
+            for (var i = 0, iLen = this.s.dt.aoColumns.length; i < iLen; i++) {
+                if (this.s.dt.aoColumns[i].sWidth)
+                    this.s.dt.aoColumns[i].nTh.style.width = this.s.dt.aoColumns[i].sWidth;
+            }
+
+            /* Save the state */
+            // this.s.dt.oInstance.oApi._fnSaveState(this.s.dt);
+        },
+
+        /**
+        * Set the column order from an array
+        *  @method  _fnOrderColumns
+        *  @param   array a An array of integers which dictate the column order that should be applied
+        *  @returns void
+        *  @private
+        */
+        "_fnOrderColumns": function (a) {
+            if (a.length != this.s.dt.aoColumns.length) {
+                this.s.dt.oInstance.oApi._fnLog(this.s.dt, 1, "ColReorder - array reorder does not " +
+            "match known number of columns. Skipping.");
+                return;
+            }
+
+            for (var i = 0, iLen = a.length; i < iLen; i++) {
+                var currIndex = $.inArray(i, a);
+                if (i != currIndex) {
+                    /* Reorder our switching array */
+                    fnArraySwitch(a, currIndex, i);
+
+                    /* Do the column reorder in the table */
+                    this.s.dt.oInstance.fnColReorder(currIndex, i);
+                }
+            }
+
+            /* When scrolling we need to recalculate the column sizes to allow for the shift */
+            if (this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "") {
+                this.s.dt.oInstance.fnAdjustColumnSizing();
+            }
+
+            /* Save the state */
+            this.s.dt.oInstance.oApi._fnSaveState(this.s.dt);
+        },
+
+
+        /**
+        * Because we change the indexes of columns in the table, relative to their starting point
+        * we need to reorder the state columns to what they are at the starting point so we can
+        * then rearrange them again on state load!
+        *  @method  _fnStateSave
+        *  @param   object oState DataTables state
+        *  @returns string JSON encoded cookie string for DataTables
+        *  @private
+        */
+        "_fnStateSave": function (oState) {
+            var i, iLen, aCopy, iOrigColumn;
+            var oSettings = this.s.dt;
+
+            /* Sorting */
+            for (i = 0; i < oState.aaSorting.length; i++) {
+                oState.aaSorting[i][0] = oSettings.aoColumns[oState.aaSorting[i][0]]._ColReorder_iOrigCol;
+            }
+
+            var aSearchCopy = $.extend(true, [], oState.aoSearchCols);
+            oState.ColReorder = [];
+            oState.ColSizes = [];
+
+            for (i = 0, iLen = oSettings.aoColumns.length; i < iLen; i++) {
+                iOrigColumn = oSettings.aoColumns[i]._ColReorder_iOrigCol;
+
+                /* Column filter */
+                oState.aoSearchCols[iOrigColumn] = aSearchCopy[i];
+
+                /* Visibility */
+                oState.abVisCols[iOrigColumn] = oSettings.aoColumns[i].bVisible;
+
+                /* Column reordering */
+                oState.ColReorder.push(iOrigColumn);
+
+                /* Column Sizes */
+                oState.ColSizes[iOrigColumn] = oSettings.aoColumns[i].sWidth;
+            }
+        },
+
+
+        /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Mouse drop and drag
+        */
+
+        /**
+        * Add a mouse down listener to a particluar TH element
+        *  @method  _fnMouseListener
+        *  @param   int i Column index
+        *  @param   element nTh TH element clicked on
+        *  @returns void
+        *  @private
+        */
+        "_fnMouseListener": function (i, nTh) {
+            var that = this;
+
+            // listen to mousemove event for resize
+            if (this.s.allowResize) {
+                $(nTh).bind('mousemove.ColReorder', function (e) {
+                    if (that.dom.drag === null && that.dom.resize === null) {
+                        /* Store information about the mouse position */
+                        var nThTarget = e.target.nodeName == "TH" ? e.target : $(e.target).parents('TH')[0];
+                        var offset = $(nThTarget).offset();
+                        var nLength = $(nThTarget).innerWidth();
+
+                        /* are we on the col border (if so, resize col) */
+                        if (Math.abs(e.pageX - Math.round(offset.left + nLength)) <= 5) {
+                            $(nThTarget).css({ 'cursor': 'col-resize' });
+                            // catch gabs between cells
+                            $(nThTarget).closest('table').css({'cursor' : 'col-resize'});
+                        }
+                        else {
+                            $(nThTarget).css({ 'cursor': 'pointer' });
+                            $(nThTarget).closest('table').css({'cursor' : 'pointer'});
+                        }
+                    }
+                });
+            }
+
+            $(nTh).on('mousedown.ColReorder', function (e) {
+                e.preventDefault();
+                that._fnMouseDown.call(that, e, nTh, i);
+            });
+
+            // Add doubleclick also
+            if (this.s.allowHeaderDoubleClick) {
+                $(nTh).on("dblclick.ColReorder", function(e) {
+                    e.preventDefault();
+                    that._fnDblClick.call(that, e, nTh, i);
+                });
+            }
+        },
+
+
+        /**
+        * Double click on a TH element in the table header
+        *  @method  _fnMouseDown
+        *  @param   event e Mouse event
+        *  @param   element nTh TH element to be resized
+        *  @returns void
+        *  @private
+        */
+        "_fnDblClick": function (e, nTh, index) {
+            var nTable = this.s.dt.nTable;
+            var tableWidth = $(nTable).width();
+            var aoColumns = this.s.dt.aoColumns;
+
+            var realWidths = $.map($('th',$(this.s.dt.nThead)), function(l) {return $(l).width();});
+            var nThWidth = $(nTh).width();
+
+           
+            var newWidth;
+            if ($(nTh).hasClass('maxwidth')) {
+                newWidth = this.s.minResizeWidth;
+                $(nTh).removeClass('maxwidth');
+            }
+
+            else {
+                $(nTable).css({'table-layout':"auto","width":"auto"});
+                newWidth = $('th',nTable).eq(index).width();
+
+                $(nTh).addClass("maxwidth");
+            }
+
+            var newTableWidth = tableWidth + newWidth - nThWidth;
+
+            $(nTable).width(newTableWidth);
+            $(nTable).css('table-layout',"fixed");
+            $(nTh).width(newWidth);
+
+            aoColumns[index].sWidth = newWidth+"px";
+
+            this.s.fnResizeTableCallback(nTable,newTableWidth,newTableWidth-tableWidth);
+
+        },
+
+
+        /**
+        * Mouse down on a TH element in the table header
+        *  @method  _fnMouseDown
+        *  @param   event e Mouse event
+        *  @param   element nTh TH element to be dragged
+        *  @returns void
+        *  @private
+        */
+        "_fnMouseDown": function (e, nTh, i) {
+            var that = this;
+            var target, offset, idx, nThNext;
+            /* are we resizing a column ? */
+            if ($(nTh).css('cursor') == 'col-resize') {
+                this.s.mouse.startX = e.pageX;
+                this.s.mouse.startWidth = $(nTh).width();
+                this.s.tableWidth = $(nTh).closest("table").width();
+                this.s.mouse.resizeElem = $(nTh);
+                nThNext = $(nTh).next();
+                this.s.mouse.nextStartWidth = $(nThNext).width();
+                this.s.mouse.targetIndex = $('th', nTh.parentNode).index(nTh);
+                this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex(this.s.dt,
+                    this.s.mouse.targetIndex);
+                that.dom.resize = true;
+                ////////////////////
+                //Martin Marchetta 
+                //a. Disable column sorting so as to avoid issues when finishing column resizing
+                target = $(e.target).closest('th, td');
+                offset = target.offset();
+                idx = $.inArray(target[0], $.map(this.s.dt.aoColumns, function (o) { return o.nTh; }));
+                // store state so we don't tunr on sorting where we don't want it
+                this.s.dt.aoColumns[idx]._oldbSortable = this.s.dt.aoColumns[idx].bSortable;
+                this.s.dt.aoColumns[idx].bSortable = false;
+                //b. Disable Autowidth feature (now the user is in charge of setting column width so keeping this enabled looses changes after operations)
+                this.s.dt.oFeatures.bAutoWidth = false;
+                ////////////////////
+            }
+            else if (this.s.allowReorder) {
+                that.dom.resize = null;
+                /* Store information about the mouse position */
+                target = $(e.target).closest('th, td');
+                offset = target.offset();
+                idx = $.inArray(target[0], $.map(this.s.dt.aoColumns, function (o) { return o.nTh; }));
+
+                if (idx === -1) {
+                    return;
+                }
+
+                this.s.mouse.startX = e.pageX;
+                this.s.mouse.startY = e.pageY;
+                this.s.mouse.offsetX = e.pageX - offset.left;
+                this.s.mouse.offsetY = e.pageY - offset.top;
+                this.s.mouse.target = target[0];
+                this.s.mouse.targetIndex = idx;
+                this.s.mouse.fromIndex = idx;
+
+                this._fnRegions();
+            }
+            /* Add event handlers to the document */
+            $(document).on('mousemove.ColReorder', function (e) {
+                that._fnMouseMove.call(that, e, i);
+            }).on('mouseup.ColReorder', function (e) {
+                setTimeout(function () {
+                    that._fnMouseUp.call(that, e, i);
+                }, 10);
+            });
+        },
+
+
+        /**
+        * Deal with a mouse move event while dragging a node
+        *  @method  _fnMouseMove
+        *  @param   event e Mouse event
+        *  @returns void
+        *  @private
+        */
+        "_fnMouseMove": function (e) {
+            var that = this;
+            ////////////////////
+            //Martin Marchetta: Determine if ScrollX is enabled
+            var scrollXEnabled;
+
+            scrollXEnabled = this.s.dt.oInit.sScrollX === "" ? false : true;
+
+            //Keep the current table's width (used in case sScrollX is enabled to resize the whole table, giving an Excel-like behavior)
+            if (this.table_size < 0 && scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper) !== undefined) {
+                if ($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
+                    this.table_size = $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width();
+            }
+            ////////////////////
+
+            /* are we resizing a column ? */
+            if (this.dom.resize) {
+                var nTh = this.s.mouse.resizeElem;
+                var nThNext = $(nTh).next();
+                var moveLength = e.pageX - this.s.mouse.startX;
+                var newWidth = this.s.mouse.startWidth + moveLength;
+                // set a min width of 10 - this would be good to configure
+                if (newWidth < this.s.minResizeWidth) {
+                    newWidth = this.s.minResizeWidth;
+                    moveLength = newWidth - this.s.mouse.startWidth ;
+                }
+                if (moveLength !== 0 && !scrollXEnabled) {
+                    $(nThNext).width(this.s.mouse.nextStartWidth - moveLength);
+                }
+                $(nTh).width(this.s.mouse.startWidth + moveLength);
+
+                //Martin Marchetta: Resize the header too (if sScrollX is enabled)
+                if (scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length) {
+                    if ($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
+                        $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width(this.table_size + moveLength);
+                }
+
+                ////////////////////////
+                //Martin Marchetta: Fixed col resizing when the scroller is enabled.
+                var visibleColumnIndex;
+                //First determine if this plugin is being used along with the smart scroller...
+                if ($('div.dataTables_scrollBody').lenggthll) {
+                    //...if so, when resizing the header, also resize the table's body (when enabling the Scroller, the table's header and
+                    //body are split into different tables, so the column resizing doesn't work anymore)
+                    if ($('div.dataTables_scrollBody').length > 0) {
+                        //Since some columns might have been hidden, find the correct one to resize in the table's body
+                        var currentColumnIndex;
+                        visibleColumnIndex = -1;
+                        for (currentColumnIndex = -1; currentColumnIndex < this.s.dt.aoColumns.length - 1 && currentColumnIndex != colResized; currentColumnIndex++) {
+                            if (this.s.dt.aoColumns[currentColumnIndex + 1].bVisible)
+                                visibleColumnIndex++;
+                        }
+
+                        //Get the scroller's div
+                        tableScroller = $('div.dataTables_scrollBody', this.s.dt.nTableWrapper)[0];
+
+                        //Get the table
+                        scrollingTableHead = $(tableScroller)[0].childNodes[0].childNodes[0].childNodes[0];
+
+                        //Resize the columns
+                        if (moveLength  && !scrollXEnabled) {
+                            $($(scrollingTableHead)[0].childNodes[visibleColumnIndex + 1]).width(this.s.mouse.nextStartWidth - moveLength);
+                        }
+                        $($(scrollingTableHead)[0].childNodes[visibleColumnIndex]).width(this.s.mouse.startWidth + moveLength);
+
+                        //Resize the table too
+                        if (scrollXEnabled) {
+                            $($(tableScroller)[0].childNodes[0]).width(this.table_size + moveLength);
+                        }
+                    }
+                }
+
+                if (this.s.bResizeTable) {
+                    var tableMove = this.s.tableWidth + moveLength;
+                    $(nTh).closest('table').width(tableMove);
+                    this.s.fnResizeTableCallback($(nTh).closest('table'),tableMove,moveLength);
+                }
+
+                ////////////////////////
+
+                return;
+            }
+            else if (this.s.allowReorder) {
+                if (this.dom.drag === null) {
+                    /* Only create the drag element if the mouse has moved a specific distance from the start
+                    * point - this allows the user to make small mouse movements when sorting and not have a
+                    * possibly confusing drag element showing up
+                    */
+                    if (Math.pow(
+            Math.pow(e.pageX - this.s.mouse.startX, 2) +
+            Math.pow(e.pageY - this.s.mouse.startY, 2), 0.5) < 5) {
+                        return;
+                    }
+                    this._fnCreateDragNode();
+                }
+
+                /* Position the element - we respect where in the element the click occured */
+                this.dom.drag.css({
+                    left: e.pageX - this.s.mouse.offsetX,
+                    top: e.pageY - this.s.mouse.offsetY
+                });
+
+                /* Based on the current mouse position, calculate where the insert should go */
+                var bSet = false;
+                var lastToIndex = this.s.mouse.toIndex;
+
+                for (var i = 1, iLen = this.s.aoTargets.length; i < iLen; i++) {
+                    if (e.pageX < this.s.aoTargets[i - 1].x + ((this.s.aoTargets[i].x - this.s.aoTargets[i - 1].x) / 2)) {
+                        this.dom.pointer.css('left', this.s.aoTargets[i - 1].x);
+                        this.s.mouse.toIndex = this.s.aoTargets[i - 1].to;
+                        bSet = true;
+                        break;
+                    }
+                }
+
+                // The insert element wasn't positioned in the array (less than
+                // operator), so we put it at the end
+                if (!bSet) {
+                    this.dom.pointer.css('left', this.s.aoTargets[this.s.aoTargets.length - 1].x);
+                    this.s.mouse.toIndex = this.s.aoTargets[this.s.aoTargets.length - 1].to;
+                }
+
+                // Perform reordering if realtime updating is on and the column has moved
+                if (this.s.init.bRealtime && lastToIndex !== this.s.mouse.toIndex) {
+                    this.s.dt.oInstance.fnColReorder(this.s.mouse.fromIndex, this.s.mouse.toIndex);
+                    this.s.mouse.fromIndex = this.s.mouse.toIndex;
+                    this._fnRegions();
+                }
+            }
+        },
+
+
+        /**
+        * Finish off the mouse drag and insert the column where needed
+        *  @method  _fnMouseUp
+        *  @param   event e Mouse event
+        *  @returns void
+        *  @private
+        */
+        "_fnMouseUp": function (e, colResized) {
+            var that = this;
+
+            $(document).off('mousemove.ColReorder mouseup.ColReorder');
+
+            if (this.dom.drag !== null) {
+                /* Remove the guide elements */
+                this.dom.drag.remove();
+                this.dom.pointer.remove();
+                this.dom.drag = null;
+                this.dom.pointer = null;
+
+                /* Actually do the reorder */
+                this.s.dt.oInstance.fnColReorder(this.s.mouse.fromIndex, this.s.mouse.toIndex);
+
+                /* When scrolling we need to recalculate the column sizes to allow for the shift */
+                if (this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "") {
+                    this.s.dt.oInstance.fnAdjustColumnSizing();
+                }
+
+                if (this.s.dropCallback !== null) {
+                    this.s.dropCallback.call(this);
+                }
+
+                /* Save the state */
+                this.s.dt.oInstance.oApi._fnSaveState(this.s.dt);
+            }
+            else if (this.dom.resize !== null) {
+                var i;
+                var j;
+                var column;
+                var currentColumn;
+                var aoColumnsColumnindex;
+                var nextVisibleColumnIndex;
+                var previousVisibleColumnIndex;
+                var scrollXEnabled;
+
+                for (i = 0; i < this.s.dt.aoColumns.length; i++) {
+                    if (this.s.dt.aoColumns[i]._ColReorder_iOrigCol === colResized) {
+                        aoColumnsColumnindex = i;
+                        break;
+                    }
+                }
+
+                // Re-enable column sorting
+                // only if sorting were previously enabled
+                this.s.dt.aoColumns[aoColumnsColumnindex].bSortable = this.s.dt.aoColumns[aoColumnsColumnindex]._oldbSortable;
+
+                // Save the new resized column's width
+                this.s.dt.aoColumns[aoColumnsColumnindex].sWidth = $(this.s.mouse.resizeElem).innerWidth() + "px";
+
+                // If other columns might have changed their size, save their size too
+                scrollXEnabled = this.s.dt.oInit.sScrollX === "" ? false : true;
+                if (!scrollXEnabled) {
+                    //The colResized index (internal model) here might not match the visible index since some columns might have been hidden
+                    for (nextVisibleColumnIndex = colResized + 1; nextVisibleColumnIndex < this.s.dt.aoColumns.length; nextVisibleColumnIndex++) {
+                        if (this.s.dt.aoColumns[nextVisibleColumnIndex].bVisible)
+                            break;
+                    }
+
+                    for (previousVisibleColumnIndex = colResized - 1; previousVisibleColumnIndex >= 0; previousVisibleColumnIndex--) {
+                        if (this.s.dt.aoColumns[previousVisibleColumnIndex].bVisible)
+                            break;
+                    }
+
+                    if (this.s.dt.aoColumns.length > nextVisibleColumnIndex)
+                        this.s.dt.aoColumns[nextVisibleColumnIndex].sWidth = $(this.s.mouse.resizeElem).next().innerWidth() + "px";
+                    else { //The column resized is the right-most, so save the sizes of all the columns at the left
+                        currentColumn = this.s.mouse.resizeElem;
+                        for (i = previousVisibleColumnIndex; i > 0; i--) {
+                            if (this.s.dt.aoColumns[i].bVisible) {
+                                currentColumn = $(currentColumn).prev();
+                                this.s.dt.aoColumns[i].sWidth = $(currentColumn).innerWidth() + "px";
+                            }
+                        }
+                    }
+                }
+
+                //Update the internal storage of the table's width (in case we changed it because the user resized some column and scrollX was enabled
+                if (scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length) {
+                    if ($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
+                        this.table_size = $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width();
+                }
+
+                //Save the state
+                this.s.dt.oInstance.oApi._fnSaveState(this.s.dt);
+            }
+            ///////////////////////////////////////////////////////
+
+            this.dom.resize = null;
+        },
+
+
+        /**
+        * Calculate a cached array with the points of the column inserts, and the
+        * 'to' points
+        *  @method  _fnRegions
+        *  @returns void
+        *  @private
+        */
+        "_fnRegions": function () {
+            var aoColumns = this.s.dt.aoColumns;
+
+            this.s.aoTargets.splice(0, this.s.aoTargets.length);
+
+            this.s.aoTargets.push({
+                "x": $(this.s.dt.nTable).offset().left,
+                "to": 0
+            });
+
+            var iToPoint = 0;
+            for (var i = 0, iLen = aoColumns.length; i < iLen; i++) {
+                /* For the column / header in question, we want it's position to remain the same if the
+                * position is just to it's immediate left or right, so we only incremement the counter for
+                * other columns
+                */
+                if (i != this.s.mouse.fromIndex) {
+                    iToPoint++;
+                }
+
+                if (aoColumns[i].bVisible) {
+                    this.s.aoTargets.push({
+                        "x": $(aoColumns[i].nTh).offset().left + $(aoColumns[i].nTh).outerWidth(),
+                        "to": iToPoint
+                    });
+                }
+            }
+
+            /* Disallow columns for being reordered by drag and drop, counting right to left */
+            if (this.s.fixedRight !== 0) {
+                this.s.aoTargets.splice(this.s.aoTargets.length - this.s.fixedRight);
+            }
+
+            /* Disallow columns for being reordered by drag and drop, counting left to right */
+            if (this.s.fixed !== 0) {
+                this.s.aoTargets.splice(0, this.s.fixed);
+            }
+        },
+
+
+        /**
+        * Copy the TH element that is being drags so the user has the idea that they are actually
+        * moving it around the page.
+        *  @method  _fnCreateDragNode
+        *  @returns void
+        *  @private
+        */
+        "_fnCreateDragNode": function () {
+            var scrolling = this.s.dt.oScroll.sX !== "" || this.s.dt.oScroll.sY !== "";
+
+            var origCell = this.s.dt.aoColumns[this.s.mouse.targetIndex].nTh;
+            var origTr = origCell.parentNode;
+            var origThead = origTr.parentNode;
+            var origTable = origThead.parentNode;
+            var cloneCell = $(origCell).clone();
+
+            // This is a slightly odd combination of jQuery and DOM, but it is the
+            // fastest and least resource intensive way I could think of cloning
+            // the table with just a single header cell in it.
+            this.dom.drag = $(origTable.cloneNode(false))
+         .addClass('DTCR_clonedTable')
+         .append(
+            origThead.cloneNode(false).appendChild(
+               origTr.cloneNode(false).appendChild(
+                  cloneCell[0]
+               )
+            )
+         )
+         .css({
+             position: 'absolute',
+             top: 0,
+             left: 0,
+             width: $(origCell).outerWidth(),
+             height: $(origCell).outerHeight()
+         })
+         .appendTo('body');
+
+            this.dom.pointer = $('<div></div>')
+         .addClass('DTCR_pointer')
+         .css({
+             position: 'absolute',
+             top: scrolling ?
+               $('div.dataTables_scroll', this.s.dt.nTableWrapper).offset().top :
+               $(this.s.dt.nTable).offset().top,
+             height: scrolling ?
+               $('div.dataTables_scroll', this.s.dt.nTableWrapper).height() :
+               $(this.s.dt.nTable).height()
+         })
+         .appendTo('body');
+        },
+
+        /**
+        * Clean up ColReorder memory references and event handlers
+        *  @method  _fnDestroy
+        *  @returns void
+        *  @private
+        */
+        "_fnDestroy": function () {
+            var i, iLen;
+
+            for (i = 0, iLen = this.s.dt.aoDrawCallback.length; i < iLen; i++) {
+                if (this.s.dt.aoDrawCallback[i].sName === 'ColReorder_Pre') {
+                    this.s.dt.aoDrawCallback.splice(i, 1);
+                    break;
+                }
+            }
+
+            for (i = 0, iLen = ColReorder.aoInstances.length; i < iLen; i++) {
+                if (ColReorder.aoInstances[i] === this) {
+                    ColReorder.aoInstances.splice(i, 1);
+                    break;
+                }
+            }
+
+            $(this.s.dt.nTHead).find('*').off('.ColReorder');
+
+            this.s.dt.oInstance._oPluginColReorder = null;
+            this.s = null;
+        }
+    };
+
+
+
+
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+    * Static parameters
+    * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /**
+    * Array of all ColReorder instances for later reference
+    *  @property ColReorder.aoInstances
+    *  @type     array
+    *  @default  []
+    *  @static
+    *  @private
+    */
+    ColReorder.aoInstances = [];
+
+
+    /**
+    * ColReorder default settings for initialisation
+    *  @namespace
+    *  @static
+    */
+    ColReorder.defaults = {
+        /**
+        * Predefined ordering for the columns that will be applied automatically
+        * on initialisation. If not specified then the order that the columns are
+        * found to be in the HTML is the order used.
+        *  @type array
+        *  @default null
+        *  @static
+        *  @example
+        *      // Using the `oColReorder` option in the DataTables options object
+        *      $('#example').dataTable( {
+        *          "sDom": 'Rlfrtip',
+        *          "oColReorder": {
+        *              "aiOrder": [ 4, 3, 2, 1, 0 ]
+        *          }
+        *      } );
+        *
+        *  @example
+        *      // Using `new` constructor
+        *      $('#example').dataTable()
+        *
+        *      new $.fn.dataTable.ColReorder( '#example', {
+        *          "aiOrder": [ 4, 3, 2, 1, 0 ]
+        *      } );
+        */
+        aiOrder: null,
+
+        /**
+        * Redraw the table's column ordering as the end user draws the column
+        * (`true`) or wait until the mouse is released (`false` - default). Note
+        * that this will perform a redraw on each reordering, which involves an
+        * Ajax request each time if you are using server-side processing in
+        * DataTables.
+        *  @type boolean
+        *  @default false
+        *  @static
+        *  @example
+        *      // Using the `oColReorder` option in the DataTables options object
+        *      $('#example').dataTable( {
+        *          "sDom": 'Rlfrtip',
+        *          "oColReorder": {
+        *              "bRealtime": true
+        *          }
+        *      } );
+        *
+        *  @example
+        *      // Using `new` constructor
+        *      $('#example').dataTable()
+        *
+        *      new $.fn.dataTable.ColReorder( '#example', {
+        *          "bRealtime": true
+        *      } );
+        */
+        bRealtime: false,
+
+        /**
+        * Indicate how many columns should be fixed in position (counting from the
+        * left). This will typically be 1 if used, but can be as high as you like.
+        *  @type int
+        *  @default 0
+        *  @static
+        *  @example
+        *      // Using the `oColReorder` option in the DataTables options object
+        *      $('#example').dataTable( {
+        *          "sDom": 'Rlfrtip',
+        *          "oColReorder": {
+        *              "iFixedColumns": 1
+        *          }
+        *      } );
+        *
+        *  @example
+        *      // Using `new` constructor
+        *      $('#example').dataTable()
+        *
+        *      new $.fn.dataTable.ColReorder( '#example', {
+        *          "iFixedColumns": 1
+        *      } );
+        */
+        iFixedColumns: 0,
+
+        /**
+        * As `iFixedColumnsRight` but counting from the right.
+        *  @type int
+        *  @default 0
+        *  @static
+        *  @example
+        *      // Using the `oColReorder` option in the DataTables options object
+        *      $('#example').dataTable( {
+        *          "sDom": 'Rlfrtip',
+        *          "oColReorder": {
+        *              "iFixedColumnsRight": 1
+        *          }
+        *      } );
+        *
+        *  @example
+        *      // Using `new` constructor
+        *      $('#example').dataTable()
+        *
+        *      new $.fn.dataTable.ColReorder( '#example', {
+        *          "iFixedColumnsRight": 1
+        *      } );
+        */
+        iFixedColumnsRight: 0,
+
+        /**
+        * Callback function that is fired when columns are reordered
+        *  @type function():void
+        *  @default null
+        *  @static
+        *  @example
+        *      // Using the `oColReorder` option in the DataTables options object
+        *      $('#example').dataTable( {
+        *          "sDom": 'Rlfrtip',
+        *          "oColReorder": {
+        *              "fnReorderCallback": function () {
+        *                  alert( 'Columns reordered' );
+        *              }
+        *          }
+        *      } );
+        *
+        *  @example
+        *      // Using `new` constructor
+        *      $('#example').dataTable()
+        *
+        *      new $.fn.dataTable.ColReorder( '#example', {
+        *          "fnReorderCallback": function () {
+        *              alert( 'Columns reordered' );
+        *          }
+        *      } );
+        */
+        fnReorderCallback: null
+    };
+
+
+
+
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+    * Static functions
+    * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /**
+    * `Deprecated` Reset the column ordering for a DataTables instance
+    *  @method  ColReorder.fnReset
+    *  @param   object oTable DataTables instance to consider
+    *  @returns void
+    *  @static
+    *  @deprecated Use `ColReorder( table ).fnReset()` instead.
+    */
+    ColReorder.fnReset = function (oTable) {
+        for (var i = 0, iLen = ColReorder.aoInstances.length; i < iLen; i++) {
+            if (ColReorder.aoInstances[i].s.dt.oInstance == oTable) {
+                ColReorder.aoInstances[i].fnReset();
+            }
+        }
+    };
+
+
+
+
+
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+    * Constants
+    * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /**
+    * ColReorder version
+    *  @constant  VERSION
+    *  @type      String
+    *  @default   As code
+    */
+    ColReorder.VERSION = "1.1.0-dev";
+    ColReorder.prototype.VERSION = ColReorder.VERSION;
+
+
+
+
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+    * Initialisation
+    * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /*
+    * Register a new feature with DataTables
+    */
+    if (typeof $.fn.dataTable == "function" &&
      typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
-     $.fn.dataTableExt.fnVersionCheck('1.9.0') )
-{
-	$.fn.dataTableExt.aoFeatures.push( {
-		"fnInit": function( oDTSettings ) {
-			var oTable = oDTSettings.oInstance;
-			if ( typeof oTable._oPluginColReorder == 'undefined' ) {
-				var opts = typeof oDTSettings.oInit.oColReorder != 'undefined' ? 
-					oDTSettings.oInit.oColReorder : {};
-				oTable._oPluginColReorder = new ColReorder( oDTSettings.oInstance, opts );
-			} else {
-				oTable.oApi._fnLog( oDTSettings, 1, "ColReorder attempted to initialise twice. Ignoring second" );
-			}
-			
-			return null; /* No node to insert */
-		},
-		"cFeature": "R",
-		"sFeature": "ColReorder"
-	} );
-}
-else
-{
-	alert( "Warning: ColReorder requires DataTables 1.9.0 or greater - www.datatables.net/download");
-}
-
-})(jQuery, window, document);
\ No newline at end of file
+     $.fn.dataTableExt.fnVersionCheck('1.9.3')) {
+        $.fn.dataTableExt.aoFeatures.push({
+            "fnInit": function (settings) {
+                var table = settings.oInstance;
+
+                if (table._oPluginColReorder === undefined) {
+                    var opts = settings.oInit.oColReorder !== undefined ?
+                       settings.oInit.oColReorder :
+                       {};
+
+                    table._oPluginColReorder = new ColReorder(settings, opts);
+                }
+                else {
+                    table.oApi._fnLog(settings, 1, "ColReorder attempted to initialise twice. Ignoring second");
+                }
+                $(settings.nTable).width($(settings.nTable).width()).css('table-layout','fixed');
+
+                return null; /* No node for DataTables to insert */
+            },
+            "cFeature": "R",
+            "sFeature": "ColReorder"
+        });
+    }
+    else {
+        alert("Warning: ColReorder requires DataTables 1.9.3 or greater - www.datatables.net/download");
+    }
+
+
+    window.ColReorder = ColReorder;
+    $.fn.dataTable.ColReorder = ColReorder;
+
+
+})(jQuery, window, document);
+
+

From d28a34cfe0bf985c4839204ea23fae73750dabab Mon Sep 17 00:00:00 2001
From: jhubble <jghubble@gmail.com>
Date: Mon, 8 Apr 2013 10:55:13 -0700
Subject: [PATCH 2/6] Update README.md

---
 README.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 644026a..4302160 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,41 @@
 ColReorderWithResize
 ====================
 
-Column reordering with resizable columns plug-in for DataTables
\ No newline at end of file
+Column reordering with resizable columns plug-in for DataTables
+
+New options include:
+
+minResizeWidth: (default: 10). Minimum size that columns can be.
+
+bResizeTable: (Default: true). Allow table to be resized. Column resize events will grow or shrink table
+
+bAddFixed: (default: true). Automtically add taable-layout:fixed CSS to a table
+
+fnResizeTableCallback: Call function every time the table is resized
+
+allowResize (default: true): Allow table to be resized
+
+Other options remain the same as those in the <a href="http://datatables.net/extras/colreorder/">ColReorder</a> plugin.
+
+Basic initialization:
+`````javascript
+$(document).ready( function () {
+    $('#example').dataTable( {
+        "sDom": 'Rlfrtip'
+    } );
+} );
+`````
+
+The "R" option in sDom enables this feature.
+
+Additional options can be set with "oColReorder":
+`````javascript
+$(document).ready( function () {
+    $('#example').dataTable( {
+        "sDom": 'Rlfrtip',
+        "oColReorder": {
+            "bAddFixed":false
+        }
+    } );
+} );
+`````

From bcd899a3000faea3a9b86fcbca7436a54c2b9726 Mon Sep 17 00:00:00 2001
From: jhubble <jghubble@gmail.com>
Date: Mon, 8 Apr 2013 12:17:18 -0700
Subject: [PATCH 3/6] Update README.md

added double click option
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4302160..92d305b 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ fnResizeTableCallback: Call function every time the table is resized
 
 allowResize (default: true): Allow table to be resized
 
+allowHeaderDoubleClick (default: true): Double-clicking on header field will expand to "full size". double-clicking again will reduce to minimum size.
+
 Other options remain the same as those in the <a href="http://datatables.net/extras/colreorder/">ColReorder</a> plugin.
 
 Basic initialization:

From a014e3948186f07ea867704a0a992be3148cae8d Mon Sep 17 00:00:00 2001
From: jhubble <jghubble@gmail.com>
Date: Fri, 12 Apr 2013 15:10:12 -0700
Subject: [PATCH 4/6] updated to include new context menu feature

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92d305b..73eb02d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,9 @@ fnResizeTableCallback: Call function every time the table is resized
 
 allowResize (default: true): Allow table to be resized
 
-allowHeaderDoubleClick (default: true): Double-clicking on header field will expand to "full size". double-clicking again will reduce to minimum size.
+allowHeaderDoubleClick (default: false): Double-clicking on header field will expand to "full size". double-clicking again will reduce to minimum size. For best behavior, turn off sorting before enabling this.
+
+headerContextMenu (default: false): If set to true, enables a context menu for selecting columns to view. It can work with jquery ui or without jquery ui. (However it is really ugly without it.) A function can also be specified. If a function is given, it will have the scope of the element clicked. It will be passed the event object, the datatable settings and the colreorder scope. See the _fnDefaultContextMenu in the docs for example of creating a function.
 
 Other options remain the same as those in the <a href="http://datatables.net/extras/colreorder/">ColReorder</a> plugin.
 

From 0aebd15b89debe9d52efe5c6b29c07703c025e3d Mon Sep 17 00:00:00 2001
From: Jeremy Hubble <jghubble@gmail.com>
Date: Fri, 12 Apr 2013 15:05:19 -0700
Subject: [PATCH 5/6] Added column selection

added column selection, fixed a few bugs and changed dblclick default to
false
---
 index.html                       | 499 +++++++++++++++++++++++++++++++
 media/css/ColReorder.css         |  21 ++
 media/images/insert.png          | Bin 0 -> 1885 bytes
 media/js/ColReorderWithResize.js | 224 ++++++++++++--
 4 files changed, 718 insertions(+), 26 deletions(-)
 create mode 100644 index.html
 create mode 100644 media/css/ColReorder.css
 create mode 100644 media/images/insert.png

diff --git a/index.html b/index.html
new file mode 100644
index 0000000..1a8a1eb
--- /dev/null
+++ b/index.html
@@ -0,0 +1,499 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+		<title>ColReorder example</title>
+<!-- DataTables CSS -->
+<link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables.css">
+		<style type="text/css" title="currentStyle">
+			@import "media/css/ColReorder.css";
+
+th, td {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+}
+
+.dataTable th, .dataTable td {
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.dataTable {
+    border-spacing: 0;
+    margin:0;
+}
+
+.dataTable th, .dataTable td {
+    border-right: 1px solid black;
+    max-width:400px;
+}
+
+.dataTable th:last-child, .dataTable td:last-child {
+    border-right: none;
+}
+
+table.display td {
+    padding: 3px 4px 4px 3px;
+}
+
+.selcol1 {
+    float:left;
+    margin-right: 20px;
+}
+.selcol2 {
+    float:left;
+}
+      
+		</style>
+ 
+<!-- jQuery -->
+<script type="text/javascript" charset="utf8" src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.2.min.js"></script>
+ 
+<!-- DataTables -->
+<script type="text/javascript" charset="utf8" src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.js"></script>
+    
+		<script type="text/javascript" charset="utf-8" src="media/js/ColReorderWithResize.js"></script>
+		<script type="text/javascript" charset="utf-8">
+			$(document).ready( function () {
+				var oTable = $('#resizeTable').dataTable( {
+					"sDom": 'Rplfrti',
+          "oColReorder": {
+             "headerContextMenu": true
+          }
+				} );
+			} );
+		</script>
+	</head>
+  <body>
+  <div id="sampleTable">
+<table cellpadding="0" cellspacing="0" border="0" class="display" id="resizeTable">
+	<thead>
+		<tr>
+			<th>Rendering engine</th>
+			<th>Browser</th>
+			<th>Platform(s)</th>
+			<th>Engine version</th>
+			<th>CSS grade</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr class="odd_gradeX">
+			<td>Trident</td>
+			<td>Internet Explorer 4.0</td>
+			<td>Win 95+ (Entity: &amp;) - This is a very old browser!</td>
+			<td class="center">4</td>
+			<td class="center">X</td>
+		</tr>
+		<tr class="even_gradeC">
+			<td>Trident</td>
+			<td>Internet Explorer 5.0</td>
+			<td>Win 95+</td>
+			<td class="center">5</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Trident</td>
+			<td>Internet Explorer 5.5</td>
+			<td>Win 95+</td>
+			<td class="center">5.5</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Trident</td>
+			<td>Internet Explorer 6</td>
+			<td>Win 98+</td>
+			<td class="center">6</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Trident</td>
+			<td>Internet Explorer 7</td>
+			<td>Win XP SP2+</td>
+			<td class="center">7</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Trident</td>
+			<td>AOL browser (AOL desktop)</td>
+			<td>Win XP</td>
+			<td class="center">6</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko (UTF-8: $¢€)</td>
+			<td>Firefox 1.0</td>
+			<td>Win 98+ / OSX.2+</td>
+			<td class="center">1.7</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Firefox 1.5</td>
+			<td>Win 98+ / OSX.2+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Firefox 2.0</td>
+			<td>Win 98+ / OSX.2+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Firefox 3.0</td>
+			<td>Win 2k+ / OSX.3+</td>
+			<td class="center">1.9</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Camino 1.0</td>
+			<td>OSX.2+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Camino 1.5</td>
+			<td>OSX.3+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Netscape 7.2</td>
+			<td>Win 95+ / Mac OS 8.6-9.2</td>
+			<td class="center">1.7</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Netscape Browser 8</td>
+			<td>Win 98SE+</td>
+			<td class="center">1.7</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Netscape Navigator 9</td>
+			<td>Win 98+ / OSX.2+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.0</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.1</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.1</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.2</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.2</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.3</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.3</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.4</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.4</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.5</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.5</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.6</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">1.6</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.7</td>
+			<td>Win 98+ / OSX.1+</td>
+			<td class="center">1.7</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Mozilla 1.8</td>
+			<td>Win 98+ / OSX.1+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Gecko</td>
+			<td>Seamonkey 1.1</td>
+			<td>Win 98+ / OSX.2+</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Gecko</td>
+			<td>Epiphany 2.20</td>
+			<td>Gnome</td>
+			<td class="center">1.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Webkit</td>
+			<td>Safari 1.2</td>
+			<td>OSX.3</td>
+			<td class="center">125.5</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Webkit</td>
+			<td>Safari 1.3</td>
+			<td>OSX.3</td>
+			<td class="center">312.8</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Webkit</td>
+			<td>Safari 2.0</td>
+			<td>OSX.4+</td>
+			<td class="center">419.3</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Webkit</td>
+			<td>Safari 3.0</td>
+			<td>OSX.4+</td>
+			<td class="center">522.1</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Webkit</td>
+			<td>OmniWeb 5.5</td>
+			<td>OSX.4+</td>
+			<td class="center">420</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Webkit</td>
+			<td>iPod Touch / iPhone</td>
+			<td>iPod</td>
+			<td class="center">420.1</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Webkit</td>
+			<td>S60</td>
+			<td>S60</td>
+			<td class="center">413</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Presto</td>
+			<td>Opera 7.0</td>
+			<td>Win 95+ / OSX.1+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Presto</td>
+			<td>Opera 7.5</td>
+			<td>Win 95+ / OSX.2+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Presto</td>
+			<td>Opera 8.0</td>
+			<td>Win 95+ / OSX.2+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Presto</td>
+			<td>Opera 8.5</td>
+			<td>Win 95+ / OSX.2+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Presto</td>
+			<td>Opera 9.0</td>
+			<td>Win 95+ / OSX.3+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Presto</td>
+			<td>Opera 9.2</td>
+			<td>Win 88+ / OSX.3+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Presto</td>
+			<td>Opera 9.5</td>
+			<td>Win 88+ / OSX.3+</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Presto</td>
+			<td>Opera for Wii</td>
+			<td>Wii</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Presto</td>
+			<td>Nokia N800</td>
+			<td>N800</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Presto</td>
+			<td>Nintendo DS browser</td>
+			<td>Nintendo DS</td>
+			<td class="center">8.5</td>
+			<td class="center">C/A<sup>1</sup></td>
+		</tr>
+		<tr class="even_gradeC">
+			<td>KHTML</td>
+			<td>Konqureror 3.1</td>
+			<td>KDE 3.1</td>
+			<td class="center">3.1</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>KHTML</td>
+			<td>Konqureror 3.3</td>
+			<td>KDE 3.3</td>
+			<td class="center">3.3</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>KHTML</td>
+			<td>Konqureror 3.5</td>
+			<td>KDE 3.5</td>
+			<td class="center">3.5</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="odd_gradeX">
+			<td>Tasman</td>
+			<td>Internet Explorer 4.5</td>
+			<td>Mac OS 8-9</td>
+			<td class="center">-</td>
+			<td class="center">X</td>
+		</tr>
+		<tr class="even_gradeC">
+			<td>Tasman</td>
+			<td>Internet Explorer 5.1</td>
+			<td>Mac OS 7.6-9</td>
+			<td class="center">1</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="odd_gradeC">
+			<td>Tasman</td>
+			<td>Internet Explorer 5.2</td>
+			<td>Mac OS 8-X</td>
+			<td class="center">1</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="even_gradeA">
+			<td>Misc</td>
+			<td>NetFront 3.1</td>
+			<td>Embedded devices</td>
+			<td class="center">-</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="odd_gradeA">
+			<td>Misc</td>
+			<td>NetFront 3.4</td>
+			<td>Embedded devices</td>
+			<td class="center">-</td>
+			<td class="center">A</td>
+		</tr>
+		<tr class="even_gradeX">
+			<td>Misc</td>
+			<td>Dillo 0.8</td>
+			<td>Embedded devices</td>
+			<td class="center">-</td>
+			<td class="center">X</td>
+		</tr>
+		<tr class="odd_gradeX">
+			<td>Misc</td>
+			<td>Links</td>
+			<td>Text only</td>
+			<td class="center">-</td>
+			<td class="center">X</td>
+		</tr>
+		<tr class="even_gradeX">
+			<td>Misc</td>
+			<td>Lynx</td>
+			<td>Text only</td>
+			<td class="center">-</td>
+			<td class="center">X</td>
+		</tr>
+		<tr class="odd_gradeC">
+			<td>Misc</td>
+			<td>IE Mobile</td>
+			<td>Windows Mobile 6</td>
+			<td class="center">-</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="even_gradeC">
+			<td>Misc</td>
+			<td>PSP browser</td>
+			<td>PSP</td>
+			<td class="center">-</td>
+			<td class="center">C</td>
+		</tr>
+		<tr class="odd_gradeU">
+			<td>Other browsers</td>
+			<td>All others</td>
+			<td>-</td>
+			<td class="center">-</td>
+			<td class="center">U</td>
+		</tr>
+	</tbody>
+</table>
+			</div>
+
+			<h1>Initialisation code</h1>
+			<pre>
+   $(document).ready( function () {
+	    var oTable = $('#example').dataTable( {
+          "sDom": 'Rlfrtip',
+          "headerContextMenu":true
+          "oColReorder": {
+            "headerContextMenu": true
+          }
+	    } );
+} );</pre>
+
+		</div>
+	</body>
+</html>
+
diff --git a/media/css/ColReorder.css b/media/css/ColReorder.css
new file mode 100644
index 0000000..cf5cf55
--- /dev/null
+++ b/media/css/ColReorder.css
@@ -0,0 +1,21 @@
+/*
+ * Namespace DTCR - "DataTables ColReorder" plug-in
+ */
+
+table.DTCR_clonedTable {
+	background-color: rgba(255, 255, 255, 0.7);
+	z-index: 202;
+}
+
+div.DTCR_pointer {
+	width: 1px;
+	background-color: #0259C4;
+	z-index: 201;
+}
+
+body.alt div.DTCR_pointer {
+	margin-top: -15px;
+	margin-left: -9px;
+	width: 18px;
+	background: url('../images/insert.png') no-repeat top left;
+}
\ No newline at end of file
diff --git a/media/images/insert.png b/media/images/insert.png
new file mode 100644
index 0000000000000000000000000000000000000000..15d5522da64f4f036c5a717dbb320799884fa12b
GIT binary patch
literal 1885
zcmaJ?Yfuwc6ke)>fRTqUjALP&*xC`v?j}Y`Bs^n)nFNqTMNwhdEF?m*%Vv>?mPoZ#
zs@74ainfY%Y-t(Plw!alqNXAbBPu#pi$zL{3SvNQV<jZrSh4+4x-&a_&z<l4&Uel|
zceXSoDSnF2Y##ssrX(gvQkm~m=JogT1OSgbkKi^YVAD&|Xa$i?7orpn#HffY98A=r
zIe03Lsy5`e;t>Eafum8T(P?s-2qUyS)Q#a8v?Rj@fQTpqiDJ1p4QAmv8l9M9YiQzt
z8kLx{LMVsjWE`&6BotA&q9{p;73E^#Do#`+7-0}G0$Q9#L4!6=rxzK-oR_*HX6@dF
zIN(bNoh#=2Z7NNk0>%*(4hng2C<ZTr!9@rU5iAS~3tIs4VFZR?K7{Z?kuZ^fFM?t4
z)x%-3QL1cFszmxK7ZZs&YMLfR5L8%L$SV}^2r36c!o$Pe8hm~zg9z1c(9x(NRHx^T
zDM)ZVMrlY|L+C)aBAP`M&|(hb^zRb1<ZD@-{#BcphCv3Dgb*I=E@=!Xm;XOht9^~u
z)2aABe*aTguiQZ5P%5q`3Mh;@xNNRF6)B3NaFiw}B|+qkbumRv(1c!1kYJob2+C1R
zqjSeE@p8E+QKzR-9fl`L#2iL}r_rcHh=d;_L?l8<Y`7FbB+^)cR1y~!$6tcL3*m4i
zW{fK#umUZvqsO?af4Gar<+?{fOEQ@yIHg&StE3d61z(md(v0s#Fs|M!u4;TQ3&-U`
zj2Xy%u>U&fu`OnL+{@Qv%LK0nAJ;L{PBCL0mV5CH=C)i*l*A|vcd}CQ%g<jm_ct4t
zU1GCjM&~I0+}hSQWWSZ+yBWx0S-UswRIKgV+tXD>xXLOs9De@MJ3-+U->UezzfZ4b
zJDpe>ABVV|6;VdEdGHKsX=!PJ>v9@Kn~W|t@WyrzRlm8j!&R9aK9bS8z6zK&X|cdk
z*(77liTIq=RO}i#|HFm0nxSBe(bFG(ia4%38}6-pu1!C&>BfqCSbhBfpBoJzRUTSQ
zm7Qg(Nfq@x`UWc=xE=VBUxg8Ic-%RIosS7P;!Uh9cDzt5GOklknin#ycXYRrU4CE|
zd$TWUO6kcl3|5c!4{xbs?flrRU`H?4s1pw-wweTIpA2y=pZP_xi=8j5CVdaeo;kCx
z(tk-bKt*14vAi{ASD-a&`MJw2@Sf6A?*)_G)f?Y;4X0-gR}b0!GK#VKi3=ZE_Ghqe
zC3i1&{&9O_i06@;3l>z%ShA*B2V6BZ$R?+2OUa%she~$r`LN_r*{;%n2WMT;A?0bC
z`<x?oTL?67a@RFiiGPdhY2d75;JIJ=s-3r*WuKJn+T-Etbo_bgp88~-75u?&Yc9#1
zA!}b=aX&jd2QTt{7QiwAmcb_j-K@gopVzW}U616~eCJ5$SQGj*P;ECRd@V55@CB>G
z$-ze_iKgC|tjs8iGDTVw(z83-t<C2wt!<>uF}mA!xKU7Y;POO_fxlS=Wuy<;@5X<$
zW1h_i22Tfo(RY9K>y%8tG;C|wxZ=bgbB+n;_JiJU%?zB{DVbgO&K;l0($f4)EPvm-
zlN+v;S_1+DEnC0R!389oRr~E*Q?J+FnOR@k)fi;I|7kZj<@(pq>4t}An{4){BaxAZ
zH%?gQRj|6J@`?R=a0O2#7_@L5=9|4}Mg4|&WxZ+J_C6!DEOJHrsga0gds4A--}I0z
z0(Ir4@~w0iFvTagY;*62was1uOG}S><-aM}(OOpiY_D=(P^td<#@N~37i`nIC&zj2
z-9OcH-N+i&oP*rA;o^%IAVsoIPshsTvIhr)6zGqqehOLDU-LWl=f%4@in<d=f1a*B
zC7$!1M;>L4pE0-{K*64}5NYR>RpukMimF|MslT0q9QPlIW+biD--V00;u>>pd3$=G
z{Kl$ZDq^cRN%8jvq^Ez>n1dg9+UCz6?K>R94Vrd)F*dL}C`am-a4hC=-mPt|!i%1t
zRh%7s<gD%>uNYZ#gZ)K~K71uGOct$wqWyvtM1FoR?S1=~=?;@Hx$tqLv>m;F{CSiA
v3v1c-1AQT_MP7}WOBDevGdhR%UqvP!KOI{pd-r?y4=-^^lH^2e<_CWP6QK!R

literal 0
HcmV?d00001

diff --git a/media/js/ColReorderWithResize.js b/media/js/ColReorderWithResize.js
index 3eb3a30..a151614 100644
--- a/media/js/ColReorderWithResize.js
+++ b/media/js/ColReorderWithResize.js
@@ -254,7 +254,18 @@
     * @param {object} opts ColReorder options
     */
     var ColReorder = function (dt, opts) {
+                $(dt.nTableWrapper).width($(dt.nTable).width());
+                // make sure the headers are the same width as the rest of table
+                dt.aoDrawCallback.push({
+                    "fn": function ( oSettings ) {
+                        $(oSettings.nTableWrapper).width($(oSettings.nTable).width());
+                    },
+                    "sName": "Resize headers"
+                });
         var oDTSettings;
+        // Set the table to minimum size so that it doesn't stretch too far
+        $(dt.nTable).width("10px");
+
 
         // @todo - This should really be a static method offered by DataTables
         if (dt.fnSettings) {
@@ -295,7 +306,6 @@
             return null;
         }
 
-
         /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
         * Public class variables
         * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -336,6 +346,17 @@
             */
             "allowHeaderDoubleClick": true,
 
+            /**
+            * Expand or collapse columns based on header double clicks
+            * If set to true will use the default menu
+            * - If set to false, no context menu will be used
+            * - If set to true, the default context menu will be used
+            * - If given a function, that function will be called
+            *  @property headerContextMenu
+            *  @type     boolean/function
+            *  @default  true
+            */
+            "headerContextMenu": true,
 
             /**
             * Allow Resize functionnality
@@ -420,7 +441,7 @@
             * @type     function
             * @default  function(table, newSize, sizeChange) {}
             */
-            "fnbResizeTableCallback": function(){},
+            "fnResizeTableCallback": function(){},
 
             /**
             * Add table-layout:fixed css to the table
@@ -582,6 +603,36 @@
             return this;
         },
 
+        /**
+        * fnGetColumnSelectList - return html list of columns columns, with selected columns checked
+        *  @return {string} Html string
+        */
+        fnGetColumnSelectList : function() {
+
+            var tp,i;
+            var availableFields = this.s.dt.aoColumns;
+            var html ='<div class="selcol1">';
+            var d2 = (availableFields.length-1) /2;
+            for (i=0;i<availableFields.length;i++) {
+                tp = "col"+(i%2);
+                if (i > d2) {
+                    html += '</div><div class="selcol2">';
+                    d2 = 99999999;
+                }
+                var selected = availableFields[i].bVisible;
+                var title = availableFields[i].sTitle;
+                var mData = availableFields[i].mData;
+                html += '<label class="'+tp+'">'+
+                        '<input name="columns" type="checkbox" checked="'+(selected ? "checked" : "")+'" value="'+mData+'">'+
+                        title + '</label>';
+            }
+            html  += "</div>";
+
+            return html;
+        },
+
+
+
 
         /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
         * Private methods (they are of course public in JS, but recommended as private)
@@ -628,6 +679,17 @@
                 this.s.allowHeaderDoubleClick = this.s.init.allowHeaderDoubleClick;
             }
 
+            /* Allow header contextmenu */
+            if (typeof this.s.init.headerContextMenu == 'function') {
+                this.s.headerContextMenu = this.s.init.headerContextMenu;
+            }
+            else if (this.s.init.headerContextMenu) {
+                this.s.headerContextMenu = this._fnDefaultContextMenu;
+            }
+            else {
+                this.s.headerContextMenu = false;
+            }
+
             if (typeof this.s.init.minResizeWidth != 'undefined') {
                 this.s.minResizeWidth = this.s.init.minResizeWidth;
             }
@@ -717,6 +779,60 @@
             }
         },
 
+        /**
+        * Default Context menu to display the column selectors
+        *  @method  _fnDefaultContextMenu
+        *  @param   Object e Event object of the contextmenu (right click) event
+        *  @param   Object settings The datatables settings object
+        *  @param   Object ColReorderObj The ColReorder object  
+        *  @returns void
+        *  @private 
+        */
+        "_fnDefaultContextMenu" : function(e,settings,thatObj) {
+                var colSelects = thatObj.fnGetColumnSelectList();
+                var myelm = $('<div></div>');
+                myelm.append(colSelects);
+                $("input",myelm).off("change").on("change", function(e) {
+                    var index = $('input',myelm).index($(this));
+                    var checked = $(this).is(":checked");
+                    settings.oInstance.fnSetColumnVis(index,checked,true);
+                });
+                
+            if (jQuery.ui) {
+                myelm.dialog({
+                    "position":[e.clientX,e.clientY],
+                    "title":"Select Columns",
+                    "modal":true,
+                    "autoOpen":true,
+                    "close":function(event,ui) {
+                        myelm.remove();
+                    }
+                });
+            }
+            else {
+                var overlay = $('<div class="overlayDiv"></div>').appendTo("body").css({"position":"fixed",top:0,left:0, width:"100%",height:"100%","z-index":5000});
+                myelm.appendTo("body").css({position:"absolute", top:e.clientY-2, "background-color":"grey", left:e.clientX-2, "z-index":5005, "border":"1px solid black"});
+                var timer = 0;
+                myelm.mouseover(function(e) {
+                    if (timer) {
+                        clearTimeout(timer);
+                    }
+                });
+
+                myelm.mouseout(function(e) {
+                    if (timer) {
+                        clearTimeout(timer);
+                    }
+                    timer = setTimeout(
+                        function() {
+                        overlay.remove();
+                        myelm.remove();
+                    },200);
+                });
+            }
+
+        },
+
         /**
         * Set the column sizes (widths) from an array
         *  @method  _fnResizeColumns
@@ -823,9 +939,12 @@
         "_fnMouseListener": function (i, nTh) {
             var that = this;
 
+            var thead = $(nTh).closest('thead');
             // listen to mousemove event for resize
             if (this.s.allowResize) {
-                $(nTh).bind('mousemove.ColReorder', function (e) {
+                //$(nTh).bind('mousemove.ColReorder', function (e) {
+                thead.bind('mousemove.ColReorder', function (e) {
+                    var nTable = that.s.dt.nTable;
                     if (that.dom.drag === null && that.dom.resize === null) {
                         /* Store information about the mouse position */
                         var nThTarget = e.target.nodeName == "TH" ? e.target : $(e.target).parents('TH')[0];
@@ -835,15 +954,23 @@
                         /* are we on the col border (if so, resize col) */
                         if (Math.abs(e.pageX - Math.round(offset.left + nLength)) <= 5) {
                             $(nThTarget).css({ 'cursor': 'col-resize' });
-                            // catch gabs between cells
-                            $(nThTarget).closest('table').css({'cursor' : 'col-resize'});
+                            // catch gaps between cells
+                            //$(nTable).css({'cursor' : 'col-resize'});
+                            that.dom.resizeCol = "right";
+                        }
+                        else if ((e.pageX - offset.left) < 5) {
+                            $(nThTarget).css({'cursor' : 'col-resize'});
+                            //$(nTable).css({'cursor' : 'col-resize'});
+                            that.dom.resizeCol = "left";
                         }
                         else {
                             $(nThTarget).css({ 'cursor': 'pointer' });
-                            $(nThTarget).closest('table').css({'cursor' : 'pointer'});
+                            //$(nTable).css({'cursor' : 'pointer'});
                         }
                     }
                 });
+
+
             }
 
             $(nTh).on('mousedown.ColReorder', function (e) {
@@ -852,12 +979,21 @@
             });
 
             // Add doubleclick also
+            // It is best to disable sorting if using double click 
             if (this.s.allowHeaderDoubleClick) {
                 $(nTh).on("dblclick.ColReorder", function(e) {
                     e.preventDefault();
                     that._fnDblClick.call(that, e, nTh, i);
                 });
             }
+
+            if (this.s.headerContextMenu) {
+                $(nTh).off("contextmenu.ColReorder").on("contextmenu.ColReorder", function(e) {
+                    e.preventDefault();
+                    that.s.headerContextMenu.call(this,e,that.s.dt,that);
+                });
+
+            }
         },
 
 
@@ -876,10 +1012,29 @@
 
             var realWidths = $.map($('th',$(this.s.dt.nThead)), function(l) {return $(l).width();});
             var nThWidth = $(nTh).width();
+            var newWidth;
+            var that = this;
+
+            var tableResizeIt = function() {
+                var newTableWidth = tableWidth + newWidth - nThWidth;
 
+                $(nTable).width(newTableWidth);
+                $(nTable).css('table-layout',"fixed");
+                $(nTh).width(newWidth);
+
+                aoColumns[index].sWidth = newWidth+"px";
+                that.s.fnResizeTableCallback(nTable,newTableWidth,newTableWidth-tableWidth);
+            };
            
-            var newWidth;
             if ($(nTh).hasClass('maxwidth')) {
+                var newHead = $(nTable).clone();
+                $('tbody', newHead).remove();
+                var newItem = $(nTh).clone();
+                newItem.wrap("<tr />");
+                newItem.wrap("<table />");
+                $(nTable).css({'table-layout':"auto","width":"auto"});
+                this.s.dt.oFeatures.bAutoWidth = true;
+                // Lets try resizing to headers instead
                 newWidth = this.s.minResizeWidth;
                 $(nTh).removeClass('maxwidth');
             }
@@ -889,17 +1044,10 @@
                 newWidth = $('th',nTable).eq(index).width();
 
                 $(nTh).addClass("maxwidth");
+                tableResizeIt();
             }
 
-            var newTableWidth = tableWidth + newWidth - nThWidth;
-
-            $(nTable).width(newTableWidth);
-            $(nTable).css('table-layout',"fixed");
-            $(nTh).width(newWidth);
-
-            aoColumns[index].sWidth = newWidth+"px";
 
-            this.s.fnResizeTableCallback(nTable,newTableWidth,newTableWidth-tableWidth);
 
         },
 
@@ -914,18 +1062,35 @@
         */
         "_fnMouseDown": function (e, nTh, i) {
             var that = this;
-            var target, offset, idx, nThNext;
+            var target, offset, idx, nThNext, nThPrev;
             /* are we resizing a column ? */
             if ($(nTh).css('cursor') == 'col-resize') {
+                // are we at the right or left?
                 this.s.mouse.startX = e.pageX;
-                this.s.mouse.startWidth = $(nTh).width();
                 this.s.tableWidth = $(nTh).closest("table").width();
-                this.s.mouse.resizeElem = $(nTh);
-                nThNext = $(nTh).next();
-                this.s.mouse.nextStartWidth = $(nThNext).width();
-                this.s.mouse.targetIndex = $('th', nTh.parentNode).index(nTh);
-                this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex(this.s.dt,
-                    this.s.mouse.targetIndex);
+
+
+                // If we are at the left end, we expand the previous column
+                if (this.dom.resizeCol == "left") {
+                    nThPrev = $(nTh).prev();
+                    this.s.mouse.startWidth = $(nThPrev).width();
+                    this.s.mouse.resizeElem = $(nThPrev);
+                    nThNext = $(nTh).next();
+                    this.s.mouse.nextStartWidth = $(nTh).width();
+                    this.s.mouse.targetIndex = $('th', nTh.parentNode).index(nThPrev);
+                    this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex(this.s.dt, this.s.mouse.targetIndex);
+                }
+
+                // If we are at the right end of column, we expand the current column
+                else {
+                    this.s.mouse.startWidth = $(nTh).width();
+                    this.s.mouse.resizeElem = $(nTh);
+                    nThNext = $(nTh).next();
+                    this.s.mouse.nextStartWidth = $(nThNext).width();
+                    this.s.mouse.targetIndex = $('th', nTh.parentNode).index(nTh);
+                    this.s.mouse.fromIndex = this.s.dt.oInstance.oApi._fnVisibleToColumnIndex(this.s.dt, this.s.mouse.targetIndex);
+                }
+
                 that.dom.resize = true;
                 ////////////////////
                 //Martin Marchetta 
@@ -1154,7 +1319,12 @@
                 var nextVisibleColumnIndex;
                 var previousVisibleColumnIndex;
                 var scrollXEnabled;
-
+                var resizeCol = this.dom.resizeCol;
+/*
+                if (resizeCol == 'right') {
+                    colResized++;
+                }
+*/
                 for (i = 0; i < this.s.dt.aoColumns.length; i++) {
                     if (this.s.dt.aoColumns[i]._ColReorder_iOrigCol === colResized) {
                         aoColumnsColumnindex = i;
@@ -1198,10 +1368,13 @@
 
                 //Update the internal storage of the table's width (in case we changed it because the user resized some column and scrollX was enabled
                 if (scrollXEnabled && $('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length) {
-                    if ($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0)
+                    if ($('div.dataTables_scrollHead', this.s.dt.nTableWrapper).length > 0) {
                         this.table_size = $($('div.dataTables_scrollHead', this.s.dt.nTableWrapper)[0].childNodes[0].childNodes[0]).width();
+                    }
                 }
 
+                $(this.s.dt.nTableWrapper).width($(this.s.dt.nTable).width());
+
                 //Save the state
                 this.s.dt.oInstance.oApi._fnSaveState(this.s.dt);
             }
@@ -1566,7 +1739,6 @@
                 else {
                     table.oApi._fnLog(settings, 1, "ColReorder attempted to initialise twice. Ignoring second");
                 }
-                $(settings.nTable).width($(settings.nTable).width()).css('table-layout','fixed');
 
                 return null; /* No node for DataTables to insert */
             },

From 3cff76a9779a3f9a6ed5d6505d8fe0ba577f55e3 Mon Sep 17 00:00:00 2001
From: nothingisnecessary <nothingisnecessary@gmail.com>
Date: Tue, 8 Sep 2015 14:31:58 -0700
Subject: [PATCH 6/6] Fix issue where cached cells were not reordered when
 using object data rows instead of simple array for data. Issue was noticed
 when re-showing a column using col.vis(true) after it had been reordered and
 hidden.

---
 media/js/ColReorderWithResize.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/media/js/ColReorderWithResize.js b/media/js/ColReorderWithResize.js
index a151614..f7fd1fc 100644
--- a/media/js/ColReorderWithResize.js
+++ b/media/js/ColReorderWithResize.js
@@ -205,6 +205,16 @@
 
         /* Array array - internal data anodes cache */
         for (i = 0, iLen = oSettings.aoData.length; i < iLen; i++) {
+            if ($.isArray(oSettings.aoData[i]._aData))
+            {
+                // if data is simple array, swap elements by index
+                fnArraySwitch(oSettings.aoData[i]._aData, iFrom, iTo);
+            }
+            else if ($.isArray(oSettings.aoData[i].anCells))
+            {
+                // if data is row object, swap the internal cells representation instead (datatables uses this when setting column visible)
+                fnArraySwitch(oSettings.aoData[i].anCells, iFrom, iTo);
+            }
             fnArraySwitch(oSettings.aoData[i]._anHidden, iFrom, iTo);
         }