diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
index 6a57e0c6f..8edf9efa2 100644
--- a/airtime_mvc/application/views/scripts/library/library.phtml
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -1,9 +1,16 @@
-
" +
+ "
" +
"
" +
"
" +
"
");
@@ -447,15 +447,15 @@ var AIRTIME = (function(AIRTIME) {
function setFilterElement(iColumn, bVisible){
var actualId = colReorderMap[iColumn];
var selector = "div#advanced_search_col_"+actualId;
+ var $el = $(selector);
+
if (bVisible) {
- $(selector).show();
+ $el.show();
} else {
- $(selector).hide();
+ $el.hide();
}
}
- var currentColOrder = new Array();
-
oTable = $libTable.dataTable( {
// put hidden columns at the top to insure they can never be visible
@@ -764,7 +764,8 @@ var AIRTIME = (function(AIRTIME) {
"sAlign": "right",
"aiExclude": [0, 1, 2],
"sSize": "css",
- "fnStateChange": setFilterElement
+ "fnStateChange": setFilterElement,
+ "buttonText": $.i18n._("Show / hide columns")
},
"oColReorder": {
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 30076dd67..28de74cf9 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -817,17 +817,18 @@ var AIRTIME = (function(AIRTIME){
mod.checkToolBarIcons();
},
+ // R = ColReorder, C = ColVis
+ "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
+
"oColVis": {
- "aiExclude": [ 0, 1 ]
+ "aiExclude": [ 0, 1 ],
+ "buttonText": $.i18n._("Show / hide columns"),
},
"oColReorder": {
"iFixedColumns": 2
},
-
- // R = ColReorderResize, C = ColVis
- "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
-
+
"sAjaxDataProp": "schedule",
"oLanguage": datatables_dict,
"sAjaxSource": baseUrl+"showbuilder/builder-feed"
diff --git a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS
index 2a04f4f0d..c332d036e 100644
--- a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS
+++ b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS
@@ -30,8 +30,4 @@ The new _fnDomBaseButton looks like this:
return nButton;
},
-
---------------------------------------------------------------------------------
-* Line 96 has changed
-- "buttonText": "Show / hide columns",
-+ "buttonText": $.i18n._("Show / hide columns"),
\ No newline at end of file
+
\ No newline at end of file
diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js
old mode 100644
new mode 100755
diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js
old mode 100644
new mode 100755
index 4c5c3bfaf..d2d4da8ee
--- a/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js
+++ b/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js
@@ -1,6 +1,6 @@
/*
* File: ColVis.js
- * Version: 1.0.7
+ * Version: 1.0.8
* CVS: $Id$
* Description: Controls for column visiblity in DataTables
* Author: Allan Jardine (www.sprymedia.co.uk)
@@ -29,864 +29,883 @@
*/
ColVis = function( oDTSettings, oInit )
{
- /* Santiy check that we are a new instance */
- if ( !this.CLASS || this.CLASS != "ColVis" )
- {
- alert( "Warning: ColVis must be initialised with the keyword 'new'" );
- }
-
- if ( typeof oInit == 'undefined' )
- {
- oInit = {};
- }
-
-
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Public class variables
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
- /**
- * @namespace Settings object which contains customisable information for ColVis instance
- */
- this.s = {
- /**
- * DataTables settings object
- * @property dt
- * @type Object
- * @default null
- */
- "dt": null,
-
- /**
- * Customisation object
- * @property oInit
- * @type Object
- * @default passed in
- */
- "oInit": oInit,
-
- /**
- * Callback function to tell the user when the state has changed
- * @property fnStateChange
- * @type function
- * @default null
- */
- "fnStateChange": null,
-
- /**
- * Mode of activation. Can be 'click' or 'mouseover'
- * @property activate
- * @type String
- * @default click
- */
- "activate": "click",
-
- /**
- * Position of the collection menu when shown - align "left" or "right"
- * @property sAlign
- * @type String
- * @default right
- */
- "sAlign": "left",
-
- /**
- * Text used for the button
- * @property buttonText
- * @type String
- * @default Show / hide columns
- */
- "buttonText": $.i18n._("Show / hide columns"),
-
- /**
- * Flag to say if the collection is hidden
- * @property hidden
- * @type boolean
- * @default true
- */
- "hidden": true,
-
- /**
- * List of columns (integers) which should be excluded from the list
- * @property aiExclude
- * @type Array
- * @default []
- */
- "aiExclude": [],
-
- /**
- * Store the original viisbility settings so they could be restored
- * @property abOriginal
- * @type Array
- * @default []
- */
- "abOriginal": [],
-
- /**
- * Show Show-All button
- * @property bShowAll
- * @type Array
- * @default []
- */
- "bShowAll": false,
-
- /**
- * Show All button text
- * @property sShowAll
- * @type String
- * @default Restore original
- */
- "sShowAll": "Show All",
-
- /**
- * Show restore button
- * @property bRestore
- * @type Array
- * @default []
- */
- "bRestore": false,
-
- /**
- * Restore button text
- * @property sRestore
- * @type String
- * @default Restore original
- */
- "sRestore": "Restore original",
-
- /**
- * Overlay animation duration in mS
- * @property iOverlayFade
- * @type Integer
- * @default 500
- */
- "iOverlayFade": 500,
-
- /**
- * Label callback for column names. Takes three parameters: 1. the column index, 2. the column
- * title detected by DataTables and 3. the TH node for the column
- * @property fnLabel
- * @type Function
- * @default null
- */
- "fnLabel": null,
-
- /**
- * Indicate if ColVis should automatically calculate the size of buttons or not. The default
- * is for it to do so. Set to "css" to disable the automatic sizing
- * @property sSize
- * @type String
- * @default auto
- */
- "sSize": "auto",
-
- /**
- * Indicate if the column list should be positioned by Javascript, visually below the button
- * or allow CSS to do the positioning
- * @property bCssPosition
- * @type boolean
- * @default false
- */
- "bCssPosition": false
- };
-
-
- /**
- * @namespace Common and useful DOM elements for the class instance
- */
- this.dom = {
- /**
- * Wrapper for the button - given back to DataTables as the node to insert
- * @property wrapper
- * @type Node
- * @default null
- */
- "wrapper": null,
-
- /**
- * Activation button
- * @property button
- * @type Node
- * @default null
- */
- "button": null,
-
- /**
- * Collection list node
- * @property collection
- * @type Node
- * @default null
- */
- "collection": null,
-
- /**
- * Background node used for shading the display and event capturing
- * @property background
- * @type Node
- * @default null
- */
- "background": null,
-
- /**
- * Element to position over the activation button to catch mouse events when using mouseover
- * @property catcher
- * @type Node
- * @default null
- */
- "catcher": null,
-
- /**
- * List of button elements
- * @property buttons
- * @type Array
- * @default []
- */
- "buttons": [],
-
- /**
- * Restore button
- * @property restore
- * @type Node
- * @default null
- */
- "restore": null
- };
-
- /* Store global reference */
- ColVis.aInstances.push( this );
-
- /* Constructor logic */
- this.s.dt = oDTSettings;
- this._fnConstruct();
- return this;
+ /* Santiy check that we are a new instance */
+ if ( !this.CLASS || this.CLASS != "ColVis" )
+ {
+ alert( "Warning: ColVis must be initialised with the keyword 'new'" );
+ }
+
+ if ( typeof oInit == 'undefined' )
+ {
+ oInit = {};
+ }
+
+
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Public class variables
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+ /**
+ * @namespace Settings object which contains customisable information for ColVis instance
+ */
+ this.s = {
+ /**
+ * DataTables settings object
+ * @property dt
+ * @type Object
+ * @default null
+ */
+ "dt": null,
+
+ /**
+ * Customisation object
+ * @property oInit
+ * @type Object
+ * @default passed in
+ */
+ "oInit": oInit,
+
+ /**
+ * Callback function to tell the user when the state has changed
+ * @property fnStateChange
+ * @type function
+ * @default null
+ */
+ "fnStateChange": null,
+
+ /**
+ * Mode of activation. Can be 'click' or 'mouseover'
+ * @property activate
+ * @type String
+ * @default click
+ */
+ "activate": "click",
+
+ /**
+ * Position of the collection menu when shown - align "left" or "right"
+ * @property sAlign
+ * @type String
+ * @default right
+ */
+ "sAlign": "left",
+
+ /**
+ * Text used for the button
+ * @property buttonText
+ * @type String
+ * @default Show / hide columns
+ */
+ "buttonText": "Show / hide columns",
+
+ /**
+ * Flag to say if the collection is hidden
+ * @property hidden
+ * @type boolean
+ * @default true
+ */
+ "hidden": true,
+
+ /**
+ * List of columns (integers) which should be excluded from the list
+ * @property aiExclude
+ * @type Array
+ * @default []
+ */
+ "aiExclude": [],
+
+ /**
+ * Store the original viisbility settings so they could be restored
+ * @property abOriginal
+ * @type Array
+ * @default []
+ */
+ "abOriginal": [],
+
+ /**
+ * Show Show-All button
+ * @property bShowAll
+ * @type Array
+ * @default []
+ */
+ "bShowAll": false,
+
+ /**
+ * Show All button text
+ * @property sShowAll
+ * @type String
+ * @default Restore original
+ */
+ "sShowAll": "Show All",
+
+ /**
+ * Show restore button
+ * @property bRestore
+ * @type Array
+ * @default []
+ */
+ "bRestore": false,
+
+ /**
+ * Restore button text
+ * @property sRestore
+ * @type String
+ * @default Restore original
+ */
+ "sRestore": "Restore original",
+
+ /**
+ * Overlay animation duration in mS
+ * @property iOverlayFade
+ * @type Integer
+ * @default 500
+ */
+ "iOverlayFade": 500,
+
+ /**
+ * Label callback for column names. Takes three parameters: 1. the column index, 2. the column
+ * title detected by DataTables and 3. the TH node for the column
+ * @property fnLabel
+ * @type Function
+ * @default null
+ */
+ "fnLabel": null,
+
+ /**
+ * Indicate if ColVis should automatically calculate the size of buttons or not. The default
+ * is for it to do so. Set to "css" to disable the automatic sizing
+ * @property sSize
+ * @type String
+ * @default auto
+ */
+ "sSize": "auto",
+
+ /**
+ * Indicate if the column list should be positioned by Javascript, visually below the button
+ * or allow CSS to do the positioning
+ * @property bCssPosition
+ * @type boolean
+ * @default false
+ */
+ "bCssPosition": false
+ };
+
+
+ /**
+ * @namespace Common and useful DOM elements for the class instance
+ */
+ this.dom = {
+ /**
+ * Wrapper for the button - given back to DataTables as the node to insert
+ * @property wrapper
+ * @type Node
+ * @default null
+ */
+ "wrapper": null,
+
+ /**
+ * Activation button
+ * @property button
+ * @type Node
+ * @default null
+ */
+ "button": null,
+
+ /**
+ * Collection list node
+ * @property collection
+ * @type Node
+ * @default null
+ */
+ "collection": null,
+
+ /**
+ * Background node used for shading the display and event capturing
+ * @property background
+ * @type Node
+ * @default null
+ */
+ "background": null,
+
+ /**
+ * Element to position over the activation button to catch mouse events when using mouseover
+ * @property catcher
+ * @type Node
+ * @default null
+ */
+ "catcher": null,
+
+ /**
+ * List of button elements
+ * @property buttons
+ * @type Array
+ * @default []
+ */
+ "buttons": [],
+
+ /**
+ * Restore button
+ * @property restore
+ * @type Node
+ * @default null
+ */
+ "restore": null
+ };
+
+ /* Store global reference */
+ ColVis.aInstances.push( this );
+
+ /* Constructor logic */
+ this.s.dt = oDTSettings;
+ this._fnConstruct();
+ return this;
};
ColVis.prototype = {
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Public methods
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
- /**
- * Rebuild the list of buttons for this instance (i.e. if there is a column header update)
- * @method fnRebuild
- * @returns void
- */
- "fnRebuild": function ()
- {
- /* Remove the old buttons */
- for ( var i=this.dom.buttons.length-1 ; i>=0 ; i-- )
- {
- if ( this.dom.buttons[i] !== null )
- {
- this.dom.collection.removeChild( this.dom.buttons[i] );
- }
- }
- this.dom.buttons.splice( 0, this.dom.buttons.length );
-
- if ( this.dom.restore )
- {
- this.dom.restore.parentNode( this.dom.restore );
- }
-
- /* Re-add them (this is not the optimal way of doing this, it is fast and effective) */
- this._fnAddButtons();
-
- /* Update the checkboxes */
- this._fnDrawCallback();
- },
-
-
-
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Private methods (they are of course public in JS, but recommended as private)
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
- /**
- * Constructor logic
- * @method _fnConstruct
- * @returns void
- * @private
- */
- "_fnConstruct": function ()
- {
- this._fnApplyCustomisation();
-
- var that = this;
- this.dom.wrapper = document.createElement('div');
- this.dom.wrapper.className = "ColVis TableTools";
-
- this.dom.button = this._fnDomBaseButton( this.s.buttonText );
- this.dom.button.className += " ColVis_MasterButton";
- this.dom.wrapper.appendChild( this.dom.button );
-
- this.dom.catcher = this._fnDomCatcher();
- this.dom.collection = this._fnDomCollection();
- this.dom.background = this._fnDomBackground();
-
- this._fnAddButtons();
-
- /* Store the original visbility information */
- for ( var i=0, iLen=this.s.dt.aoColumns.length ; i
=0 ; i-- )
+ {
+ if ( this.dom.buttons[i] !== null )
+ {
+ this.dom.collection.removeChild( this.dom.buttons[i] );
+ }
+ }
+ this.dom.buttons.splice( 0, this.dom.buttons.length );
+
+ if ( this.dom.restore )
+ {
+ this.dom.restore.parentNode( this.dom.restore );
+ }
+
+ /* Re-add them (this is not the optimal way of doing this, it is fast and effective) */
+ this._fnAddButtons();
+
+ /* Update the checkboxes */
+ this._fnDrawCallback();
+ },
+
+
+
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Private methods (they are of course public in JS, but recommended as private)
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+ /**
+ * Constructor logic
+ * @method _fnConstruct
+ * @returns void
+ * @private
+ */
+ "_fnConstruct": function ()
+ {
+ this._fnApplyCustomisation();
+
+ var that = this;
+ var i, iLen;
+ this.dom.wrapper = document.createElement('div');
+ this.dom.wrapper.className = "ColVis TableTools";
+
+ this.dom.button = this._fnDomBaseButton( this.s.buttonText );
+ this.dom.button.className += " ColVis_MasterButton";
+ this.dom.wrapper.appendChild( this.dom.button );
+
+ this.dom.catcher = this._fnDomCatcher();
+ this.dom.collection = this._fnDomCollection();
+ this.dom.background = this._fnDomBackground();
+
+ this._fnAddButtons();
+
+ /* Store the original visbility information */
+ for ( i=0, iLen=this.s.dt.aoColumns.length ; i'+this.s.sRestore+'' );
-
- $(nButton).click( function (e) {
- for ( var i=0, iLen=that.s.abOriginal.length ; i'+this.s.sShowAll+'' );
-
- $(nButton).click( function (e) {
- for ( var i=0, iLen=that.s.abOriginal.length ; i'+
- ''+sTitle+'' );
-
- $(nButton).click( function (e) {
- var showHide = !$('input', this).is(":checked");
- if ( e.target.nodeName.toLowerCase() == "input" )
- {
- showHide = $('input', this).is(":checked");
- }
-
- /* Need to consider the case where the initialiser created more than one table - change the
- * API index that DataTables is using
- */
- var oldIndex = $.fn.dataTableExt.iApiIndex;
- $.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
+ /* If columns are reordered, then we need to update our exclude list and
+ * rebuild the displayed list
+ */
+ $(this.s.dt.oInstance).bind( 'column-reorder', function ( e, oSettings, oReorder ) {
+ for ( i=0, iLen=that.s.aiExclude.length ; i");
- nSpan.innerHTML = text;
-
- $(nButton).bind( 'click', function (e) {
- that._fnCollectionShow();
- e.preventDefault();
- } );
-
- return nButton;
- },
-
-
- /**
- * Create the element used to contain list the columns (it is shown and hidden as needed)
- * @method _fnDomCollection
- * @returns {Node} div container for the collection
- * @private
- */
- "_fnDomCollection": function ()
- {
- var that = this;
- var nHidden = document.createElement('div');
- nHidden.style.display = "none";
- nHidden.className = !this.s.dt.bJUI ? "ColVis_collection TableTools_collection" :
- "ColVis_collection TableTools_collection ui-buttonset ui-buttonset-multi";
-
- if ( !this.s.bCssPosition )
- {
- nHidden.style.position = "absolute";
- }
- $(nHidden).css('opacity', 0);
-
- return nHidden;
- },
-
-
- /**
- * An element to be placed on top of the activate button to catch events
- * @method _fnDomCatcher
- * @returns {Node} div container for the collection
- * @private
- */
- "_fnDomCatcher": function ()
- {
- var
- that = this,
- nCatcher = document.createElement('div');
- nCatcher.className = "ColVis_catcher TableTools_catcher";
-
- $(nCatcher).click( function () {
- that._fnCollectionHide.call( that, null, null );
- } );
-
- return nCatcher;
- },
-
-
- /**
- * Create the element used to shade the background, and capture hide events (it is shown and
- * hidden as needed)
- * @method _fnDomBackground
- * @returns {Node} div container for the background
- * @private
- */
- "_fnDomBackground": function ()
- {
- var that = this;
-
- var nBackground = document.createElement('div');
- nBackground.style.position = "absolute";
- nBackground.style.left = "0px";
- nBackground.style.top = "0px";
- nBackground.className = "ColVis_collectionBackground TableTools_collectionBackground";
- $(nBackground).css('opacity', 0);
-
- $(nBackground).click( function () {
- that._fnCollectionHide.call( that, null, null );
- } );
-
- /* When considering a mouse over action for the activation, we also consider a mouse out
- * which is the same as a mouse over the background - without all the messing around of
- * bubbling events. Use the catcher element to avoid messing around with bubbling
- */
- if ( this.s.activate == "mouseover" )
- {
- $(nBackground).mouseover( function () {
- that.s.overcollection = false;
- that._fnCollectionHide.call( that, null, null );
- } );
- }
-
- return nBackground;
- },
-
-
- /**
- * Show the show / hide list and the background
- * @method _fnCollectionShow
- * @returns void
- * @private
- */
- "_fnCollectionShow": function ()
- {
- var that = this, i, iLen;
- var oPos = $(this.dom.button).offset();
- var nHidden = this.dom.collection;
- var nBackground = this.dom.background;
- var iDivX = parseInt(oPos.left, 10);
- var iDivY = parseInt(oPos.top + $(this.dom.button).outerHeight(), 10);
-
- if ( !this.s.bCssPosition )
- {
- nHidden.style.top = iDivY+"px";
- nHidden.style.left = iDivX+"px";
- }
- nHidden.style.display = "block";
- $(nHidden).css('opacity',0);
-
- var iWinHeight = $(window).height(), iDocHeight = $(document).height(),
- iWinWidth = $(window).width(), iDocWidth = $(document).width();
-
- nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px";
- nBackground.style.width = ((iWinWidth'+this.s.sRestore+'' );
+
+ $(nButton).click( function (e) {
+ for ( var i=0, iLen=that.s.abOriginal.length ; i'+this.s.sShowAll+'' );
+
+ $(nButton).click( function (e) {
+ for ( var i=0, iLen=that.s.abOriginal.length ; i'+
+ ''+sTitle+'' );
+
+ $(nButton).click( function (e) {
+ var showHide = !$('input', this).is(":checked");
+ if ( e.target.nodeName.toLowerCase() == "input" )
+ {
+ showHide = $('input', this).is(":checked");
+ }
+
+ /* Need to consider the case where the initialiser created more than one table - change the
+ * API index that DataTables is using
+ */
+ var oldIndex = $.fn.dataTableExt.iApiIndex;
+ $.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that);
- var iDivWidth = $(nHidden).outerWidth();
- var iDivHeight = $(nHidden).outerHeight();
-
- if ( iDivX + iDivWidth > iDocWidth )
- {
- nHidden.style.left = (iDocWidth-iDivWidth)+"px";
- }
- }
-
- /* This results in a very small delay for the end user but it allows the animation to be
- * much smoother. If you don't want the animation, then the setTimeout can be removed
- */
- setTimeout( function () {
- $(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
- $(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
- /* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
- * reflected. As such, we need to do it here, once it is visible. Unbelievable.
- */
- if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
- {
- that._fnDrawCallback();
- }
- });
- }, 10 );
-
- this.s.hidden = false;
- },
-
-
- /**
- * Hide the show / hide list and the background
- * @method _fnCollectionHide
- * @returns void
- * @private
- */
- "_fnCollectionHide": function ( )
- {
- var that = this;
-
- if ( !this.s.hidden && this.dom.collection !== null )
- {
- this.s.hidden = true;
-
- $(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
- this.style.display = "none";
- } );
-
- $(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
- document.body.removeChild( that.dom.background );
- document.body.removeChild( that.dom.catcher );
- } );
- }
- },
-
-
- /**
- * Alter the colspan on any fnOpen rows
- */
- "_fnAdjustOpenRows": function ()
- {
- var aoOpen = this.s.dt.aoOpenRows;
- var iVisible = this.s.dt.oApi._fnVisbleColumns( this.s.dt );
-
- for ( var i=0, iLen=aoOpen.length ; iiDocHeight)? iWinHeight : iDocHeight) +"px";
+ nBackground.style.width = ((iWinWidth iDocWidth )
+ {
+ nHidden.style.left = (iDocWidth-iDivWidth)+"px";
+ }
+ }
+
+ /* This results in a very small delay for the end user but it allows the animation to be
+ * much smoother. If you don't want the animation, then the setTimeout can be removed
+ */
+ setTimeout( function () {
+ $(nHidden).animate({"opacity": 1}, that.s.iOverlayFade);
+ $(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () {
+ /* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually
+ * reflected. As such, we need to do it here, once it is visible. Unbelievable.
+ */
+ if ( jQuery.browser.msie && jQuery.browser.version == "6.0" )
+ {
+ that._fnDrawCallback();
+ }
+ });
+ }, 10 );
+
+ this.s.hidden = false;
+ },
+
+
+ /**
+ * Hide the show / hide list and the background
+ * @method _fnCollectionHide
+ * @returns void
+ * @private
+ */
+ "_fnCollectionHide": function ( )
+ {
+ var that = this;
+
+ if ( !this.s.hidden && this.dom.collection !== null )
+ {
+ this.s.hidden = true;
+
+ $(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
+ this.style.display = "none";
+ } );
+
+ $(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
+ document.body.removeChild( that.dom.background );
+ document.body.removeChild( that.dom.catcher );
+ } );
+ }
+ },
+
+
+ /**
+ * Alter the colspan on any fnOpen rows
+ */
+ "_fnAdjustOpenRows": function ()
+ {
+ var aoOpen = this.s.dt.aoOpenRows;
+ var iVisible = this.s.dt.oApi._fnVisbleColumns( this.s.dt );
+
+ for ( var i=0, iLen=aoOpen.length ; i