From 1d2a9709a822cd2f55bc0ea914be1596b193511f Mon Sep 17 00:00:00 2001 From: James Date: Wed, 12 Oct 2011 16:38:07 -0400 Subject: [PATCH] CC-2872: Playlist builder: Metadata tooltip displays in upper left hand corner when changing number of rows to display on the screen - The metadata is now displayed on right click --- .../public/js/airtime/library/library.js | 89 +- .../js/datatables/js/jquery.dataTables.js | 2156 +++++++++++------ .../js/datatables/js/jquery.dataTables.min.js | 267 +- 3 files changed, 1567 insertions(+), 945 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 98a185f18..6408e5c97 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -111,46 +111,13 @@ function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { // insert id on lenth field $('td:eq(4)', nRow).attr("id", "length"); - - $('td:gt(0)', nRow).qtip({ - content: { - text: "Loading...", - title: { - text: aData[1] - }, - ajax: { - url: "/Library/get-file-meta-data", - type: "post", - data: ({format: "html", id : id, type: type}), - success: function(data, status){ - this.set('content.text', data) - } - } - }, - position: { - adjust: { - resize: true, - method: "flip flip" - }, - at: "right center", - my: "left top", - viewport: $(window) - }, - style: { - width: 570, - classes: "ui-tooltip-dark" - }, - show: { - delay: 700 - } - } - ); return nRow; } function dtDrawCallback() { addLibraryItemEvents(); + addMetadataQtip(); } function addProgressIcon(id) { @@ -254,6 +221,60 @@ function addQtipToSCIcons(){ }); } +function addMetadataQtip(){ + var tableRow = $('#library_display tbody tr'); + tableRow.each(function(){ + var title = $(this).find('td:eq(0)').html() + var info = $(this).attr("id") + info = info.split("_"); + var id = info[1]; + var type = info[0]; + $(this).qtip({ + content: { + text: "Loading...", + title: { + text: title + }, + ajax: { + url: "/Library/get-file-meta-data", + type: "post", + data: ({format: "html", id : id, type: type}), + success: function(data, status){ + this.set('content.text', data) + } + } + }, + position: { + target: 'event', + adjust: { + resize: true, + method: "flip flip" + }, + at: "right center", + my: "left top", + viewport: $(window) + }, + style: { + width: 570, + classes: "ui-tooltip-dark" + }, + show: 'mousedown', + events: { + show: function(event, api) { + // Only show the tooltip if it was a right-click + if(event.originalEvent.button !== 2) { + event.preventDefault(); + } + } + } + }) + }) + + tableRow.bind('contextmenu', function(e){ + return false; + }) +} + $(document).ready(function() { $('.tabs').tabs(); diff --git a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js index 4ba698de5..a295d1706 100644 --- a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js +++ b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js @@ -1,6 +1,6 @@ /* * File: jquery.dataTables.js - * Version: 1.7.5 + * Version: 1.8.2 * Description: Paginate, search and sort HTML tables * Author: Allan Jardine (www.sprymedia.co.uk) * Created: 28/3/2008 @@ -9,7 +9,7 @@ * Project: Mtaala * Contact: allan.jardine@sprymedia.co.uk * - * Copyright 2008-2010 Allan Jardine, all rights reserved. + * Copyright 2008-2011 Allan Jardine, all rights reserved. * * This source file is free software, under either the GPL v2 license or a * BSD style license, as supplied with this software. @@ -22,11 +22,10 @@ */ /* - * When considering jsLint, we need to allow eval() as it it is used for reading cookies and - * building the dynamic multi-column sort functions. + * When considering jsLint, we need to allow eval() as it it is used for reading cookies */ /*jslint evil: true, undef: true, browser: true */ -/*globals $, jQuery,_fnExternApiFunc,_fnInitalise,_fnInitComplete,_fnLanguageProcess,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnGatherData,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxUpdateDraw,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnArrayCmp,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap*/ +/*globals $, jQuery,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageProcess,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnServerParams,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnArrayCmp,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn*/ (function($, window, document) { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -53,7 +52,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Section - DataTables extensible objects * - * The _oExt object is used to provide an area where user dfined plugins can be + * The _oExt object is used to provide an area where user defined plugins can be * added to DataTables. The following properties of the object are used: * oApi - Plug-in API functions * aTypes - Auto-detection of types @@ -68,7 +67,7 @@ * Notes: Allowed format is a.b.c.d.e where: * a:int, b:int, c:int, d:string(dev|beta), e:int. d and e are optional */ - _oExt.sVersion = "1.7.5"; + _oExt.sVersion = "1.8.2"; /* * Variable: sErrMode @@ -149,15 +148,15 @@ /* Full numbers paging buttons */ "sPageButton": "paginate_button", "sPageButtonActive": "paginate_active", - "sPageButtonStaticDisabled": "paginate_button", + "sPageButtonStaticDisabled": "paginate_button paginate_button_disabled", "sPageFirst": "first", "sPagePrevious": "previous", "sPageNext": "next", "sPageLast": "last", - /* Stripping classes */ - "sStripOdd": "odd", - "sStripEven": "even", + /* Striping classes */ + "sStripeOdd": "odd", + "sStripeEven": "even", /* Empty row */ "sRowEmpty": "dataTables_empty", @@ -184,6 +183,7 @@ "sSortJUIAscAllowed": "", "sSortJUIDescAllowed": "", "sSortJUIWrapper": "", + "sSortIcon": "", /* Scrolling */ "sScrollWrapper": "dataTables_scroll", @@ -220,9 +220,9 @@ "sPageNext": "next", "sPageLast": "last ui-corner-tr ui-corner-br", - /* Stripping classes */ - "sStripOdd": "odd", - "sStripEven": "even", + /* Striping classes */ + "sStripeOdd": "odd", + "sStripeEven": "even", /* Empty row */ "sRowEmpty": "dataTables_empty", @@ -250,6 +250,7 @@ "sSortJUIAscAllowed": "css_right ui-icon ui-icon-carat-1-n", "sSortJUIDescAllowed": "css_right ui-icon ui-icon-carat-1-s", "sSortJUIWrapper": "DataTables_sort_wrapper", + "sSortIcon": "DataTables_sort_icon", /* Scrolling */ "sScrollWrapper": "dataTables_scroll", @@ -272,15 +273,15 @@ /* * Variable: two_button * Purpose: Standard two button (forward/back) pagination - * Scope: jQuery.fn.dataTableExt.oPagination + * Scope: jQuery.fn.dataTableExt.oPagination */ "two_button": { /* * Function: oPagination.two_button.fnInit - * Purpose: Initalise dom elements required for pagination with forward/back buttons only + * Purpose: Initialise dom elements required for pagination with forward/back buttons only * Returns: - - * Inputs: object:oSettings - dataTables settings object - * node:nPaging - the DIV which contains this pagination control + * Inputs: object:oSettings - dataTables settings object + * node:nPaging - the DIV which contains this pagination control * function:fnCallbackDraw - draw function which must be called on update */ "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) @@ -318,7 +319,7 @@ nPaging.appendChild( nPrevious ); nPaging.appendChild( nNext ); - $(nPrevious).click( function() { + $(nPrevious).bind( 'click.DT', function() { if ( oSettings.oApi._fnPageChange( oSettings, "previous" ) ) { /* Only draw when the page has actually changed */ @@ -326,7 +327,7 @@ } } ); - $(nNext).click( function() { + $(nNext).bind( 'click.DT', function() { if ( oSettings.oApi._fnPageChange( oSettings, "next" ) ) { fnCallbackDraw( oSettings ); @@ -334,8 +335,8 @@ } ); /* Take the brutal approach to cancelling text selection */ - $(nPrevious).bind( 'selectstart', function () { return false; } ); - $(nNext).bind( 'selectstart', function () { return false; } ); + $(nPrevious).bind( 'selectstart.DT', function () { return false; } ); + $(nNext).bind( 'selectstart.DT', function () { return false; } ); /* ID the first elements only */ if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.p == "undefined" ) @@ -350,7 +351,7 @@ * Function: oPagination.two_button.fnUpdate * Purpose: Update the two button pagination at the end of the draw * Returns: - - * Inputs: object:oSettings - dataTables settings object + * Inputs: object:oSettings - dataTables settings object * function:fnCallbackDraw - draw function to call on page change */ "fnUpdate": function ( oSettings, fnCallbackDraw ) @@ -382,22 +383,22 @@ /* * Variable: iFullNumbersShowPages * Purpose: Change the number of pages which can be seen - * Scope: jQuery.fn.dataTableExt.oPagination + * Scope: jQuery.fn.dataTableExt.oPagination */ "iFullNumbersShowPages": 5, /* * Variable: full_numbers * Purpose: Full numbers pagination - * Scope: jQuery.fn.dataTableExt.oPagination + * Scope: jQuery.fn.dataTableExt.oPagination */ "full_numbers": { /* * Function: oPagination.full_numbers.fnInit - * Purpose: Initalise dom elements required for pagination with a list of the pages + * Purpose: Initialise dom elements required for pagination with a list of the pages * Returns: - - * Inputs: object:oSettings - dataTables settings object - * node:nPaging - the DIV which contains this pagination control + * Inputs: object:oSettings - dataTables settings object + * node:nPaging - the DIV which contains this pagination control * function:fnCallbackDraw - draw function which must be called on update */ "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) @@ -425,28 +426,28 @@ nPaging.appendChild( nNext ); nPaging.appendChild( nLast ); - $(nFirst).click( function () { + $(nFirst).bind( 'click.DT', function () { if ( oSettings.oApi._fnPageChange( oSettings, "first" ) ) { fnCallbackDraw( oSettings ); } } ); - $(nPrevious).click( function() { + $(nPrevious).bind( 'click.DT', function() { if ( oSettings.oApi._fnPageChange( oSettings, "previous" ) ) { fnCallbackDraw( oSettings ); } } ); - $(nNext).click( function() { + $(nNext).bind( 'click.DT', function() { if ( oSettings.oApi._fnPageChange( oSettings, "next" ) ) { fnCallbackDraw( oSettings ); } } ); - $(nLast).click( function() { + $(nLast).bind( 'click.DT', function() { if ( oSettings.oApi._fnPageChange( oSettings, "last" ) ) { fnCallbackDraw( oSettings ); @@ -455,8 +456,8 @@ /* Take the brutal approach to cancelling text selection */ $('span', nPaging) - .bind( 'mousedown', function () { return false; } ) - .bind( 'selectstart', function () { return false; } ); + .bind( 'mousedown.DT', function () { return false; } ) + .bind( 'selectstart.DT', function () { return false; } ); /* ID the first elements only */ if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.p == "undefined" ) @@ -473,7 +474,7 @@ * Function: oPagination.full_numbers.fnUpdate * Purpose: Update the list of page buttons shows * Returns: - - * Inputs: object:oSettings - dataTables settings object + * Inputs: object:oSettings - dataTables settings object * function:fnCallbackDraw - draw function to call on page change */ "fnUpdate": function ( oSettings, fnCallbackDraw ) @@ -535,12 +536,12 @@ /* Loop over each instance of the pager */ var an = oSettings.aanFeatures.p; var anButtons, anStatic, nPaginateList; - var fnClick = function() { + var fnClick = function(e) { /* Use the information in the element to jump to the required page */ var iTarget = (this.innerHTML * 1) - 1; oSettings._iDisplayStart = iTarget * oSettings._iDisplayLength; fnCallbackDraw( oSettings ); - return false; + e.preventDefault(); }; var fnFalse = function () { return false; }; @@ -554,8 +555,8 @@ /* Build up the dynamic list forst - html and listeners */ var qjPaginateList = $('span:eq(2)', an[i]); qjPaginateList.html( sList ); - $('span', qjPaginateList).click( fnClick ).bind( 'mousedown', fnFalse ) - .bind( 'selectstart', fnFalse ); + $('span', qjPaginateList).bind( 'click.DT', fnClick ).bind( 'mousedown.DT', fnFalse ) + .bind( 'selectstart.DT', fnFalse ); /* Update the 'premanent botton's classes */ anButtons = an[i].getElementsByTagName('span'); @@ -605,6 +606,8 @@ */ "string-asc": function ( a, b ) { + if ( typeof a != 'string' ) { a = ''; } + if ( typeof b != 'string' ) { b = ''; } var x = a.toLowerCase(); var y = b.toLowerCase(); return ((x < y) ? -1 : ((x > y) ? 1 : 0)); @@ -612,6 +615,8 @@ "string-desc": function ( a, b ) { + if ( typeof a != 'string' ) { a = ''; } + if ( typeof b != 'string' ) { b = ''; } var x = a.toLowerCase(); var y = b.toLowerCase(); return ((x < y) ? 1 : ((x > y) ? -1 : 0)); @@ -646,7 +651,7 @@ if ( isNaN(x) || x==="" ) { - x = Date.parse( "01/01/1970 00:00:00" ); + x = Date.parse( "01/01/1970 00:00:00" ); } if ( isNaN(y) || y==="" ) { @@ -663,7 +668,7 @@ if ( isNaN(x) || x==="" ) { - x = Date.parse( "01/01/1970 00:00:00" ); + x = Date.parse( "01/01/1970 00:00:00" ); } if ( isNaN(y) || y==="" ) { @@ -711,15 +716,19 @@ * Function: - * Purpose: Check to see if a string is numeric * Returns: string:'numeric' or null - * Inputs: string:sText - string to check + * Inputs: mixed:sText - string to check */ function ( sData ) { /* Allow zero length strings as a number */ - if ( sData.length === 0 ) + if ( typeof sData == 'number' ) { return 'numeric'; } + else if ( typeof sData != 'string' ) + { + return null; + } var sValidFirstChars = "0123456789-"; var sValidChars = "0123456789."; @@ -765,7 +774,7 @@ function ( sData ) { var iParse = Date.parse(sData); - if ( (iParse !== null && !isNaN(iParse)) || sData.length === 0 ) + if ( (iParse !== null && !isNaN(iParse)) || (typeof sData == 'string' && sData.length === 0) ) { return 'date'; } @@ -780,7 +789,7 @@ */ function ( sData ) { - if ( sData.indexOf('<') != -1 && sData.indexOf('>') != -1 ) + if ( typeof sData == 'string' && sData.indexOf('<') != -1 && sData.indexOf('>') != -1 ) { return 'html'; } @@ -840,7 +849,7 @@ * Function: dataTable * Purpose: DataTables information * Returns: - - * Inputs: object:oInit - initalisation options for the table + * Inputs: object:oInit - initialisation options for the table */ $.fn.dataTable = function( oInit ) { @@ -914,7 +923,8 @@ "bProcessing": false, "bSortClasses": true, "bStateSave": false, - "bServerSide": false + "bServerSide": false, + "bDeferRender": false }; /* @@ -959,10 +969,12 @@ "sLengthMenu": "Show _MENU_ entries", "sZeroRecords": "No matching records found", "sEmptyTable": "No data available in table", + "sLoadingRecords": "Loading...", "sInfo": "Showing _START_ to _END_ of _TOTAL_ entries", "sInfoEmpty": "Showing 0 to 0 of 0 entries", "sInfoFiltered": "(filtered from _MAX_ total entries)", "sInfoPostFix": "", + "sInfoThousands": ",", "sSearch": "Search:", "sUrl": "", "oPaginate": { @@ -1007,6 +1019,20 @@ * Scope: jQuery.dataTable.classSettings */ this.aoColumns = []; + + /* + * Variable: aoHeader + * Purpose: Store information about the table's header + * Scope: jQuery.dataTable.classSettings + */ + this.aoHeader = []; + + /* + * Variable: aoFooter + * Purpose: Store information about the table's footer + * Scope: jQuery.dataTable.classSettings + */ + this.aoFooter = []; /* * Variable: iNextId @@ -1059,22 +1085,22 @@ this.aaSortingFixed = null; /* - * Variable: asStripClasses + * Variable: asStripeClasses * Purpose: Classes to use for the striping of a table * Scope: jQuery.dataTable.classSettings */ - this.asStripClasses = []; + this.asStripeClasses = []; /* - * Variable: asDestoryStrips - * Purpose: If restoring a table - we should restore it's striping classes as well + * Variable: asDestroyStripes + * Purpose: If restoring a table - we should restore its striping classes as well * Scope: jQuery.dataTable.classSettings */ - this.asDestoryStrips = []; + this.asDestroyStripes = []; /* * Variable: sDestroyWidth - * Purpose: If restoring a table - we should restore it's width + * Purpose: If restoring a table - we should restore its width * Scope: jQuery.dataTable.classSettings */ this.sDestroyWidth = 0; @@ -1110,9 +1136,17 @@ */ this.aoDrawCallback = []; + /* + * Variable: fnPreDrawCallback + * Purpose: Callback function for just before the table is redrawn. A return of false + * will be used to cancel the draw. + * Scope: jQuery.dataTable.classSettings + */ + this.fnPreDrawCallback = null; + /* * Variable: fnInitComplete - * Purpose: Callback function for when the table has been initalised + * Purpose: Callback function for when the table has been initialised * Scope: jQuery.dataTable.classSettings */ this.fnInitComplete = null; @@ -1159,6 +1193,14 @@ */ this.nTableWrapper = null; + /* + * Variable: bDeferLoading + * Purpose: Indicate if when using server-side processing the loading of data + * should be deferred until the second draw + * Scope: jQuery.dataTable.classSettings + */ + this.bDeferLoading = false; + /* * Variable: bInitialised * Purpose: Indicate if all required information has been read in @@ -1262,6 +1304,15 @@ */ this.sAjaxSource = null; + /* + * Variable: sAjaxDataProp + * Purpose: Property from a given object from which to read the table data from. This can + * be an empty string (when not server-side processing), in which case it is + * assumed an an array is given directly. + * Scope: jQuery.dataTable.classSettings + */ + this.sAjaxDataProp = 'aaData'; + /* * Variable: bAjaxDataGet * Purpose: Note if draw should be blocked while getting data @@ -1269,16 +1320,27 @@ */ this.bAjaxDataGet = true; + /* + * Variable: jqXHR + * Purpose: The last jQuery XHR object that was used for server-side data gathering. + * This can be used for working with the XHR information in one of the callbacks + * Scope: jQuery.dataTable.classSettings + */ + this.jqXHR = null; + /* * Variable: fnServerData * Purpose: Function to get the server-side data - can be overruled by the developer * Scope: jQuery.dataTable.classSettings */ - this.fnServerData = function ( url, data, callback ) { - $.ajax( { + this.fnServerData = function ( url, data, callback, settings ) { + settings.jqXHR = $.ajax( { "url": url, "data": data, - "success": callback, + "success": function (json) { + $(settings.oInstance).trigger('xhr', settings); + callback( json ); + }, "dataType": "json", "cache": false, "error": function (xhr, error, thrown) { @@ -1290,6 +1352,17 @@ } ); }; + /* + * Variable: aoServerParams + * Purpose: Functions which are called prior to sending an Ajax request so extra parameters + * can easily be sent to the server + * Scope: jQuery.dataTable.classSettings + * Notes: Each array element is an object with the following parameters: + * function:fn - function to call + * string:sName - name callback - useful for knowing where it came from (plugin etc) + */ + this.aoServerParams = []; + /* * Variable: fnFormatNumber * Purpose: Format numbers for display @@ -1310,7 +1383,7 @@ { if ( i%3 === 0 && i !== 0 ) { - out = ','+out; + out = this.oLanguage.sInfoThousands+out; } out = a[iLen-i-1]+out; } @@ -1380,7 +1453,7 @@ this.bJUI = false; /* - * Variable: bJUI + * Variable: oClasses * Purpose: Should we add the markup needed for jQuery UI theming? * Scope: jQuery.dataTable.classSettings */ @@ -1394,12 +1467,28 @@ this.bFiltered = false; this.bSorted = false; + /* + * Variable: bSortCellsTop + * Purpose: Indicate that if multiple rows are in the header and there is more than one + * unique cell per column, if the top one (true) or bottom one (false) should + * be used for sorting / title by DataTables + * Scope: jQuery.dataTable.classSettings + */ + this.bSortCellsTop = false; + /* * Variable: oInit * Purpose: Initialisation object that is used for the table * Scope: jQuery.dataTable.classSettings */ this.oInit = null; + + /* + * Variable: aoDestroyCallback + * Purpose: Destroy callback functions + * Scope: jQuery.dataTable.classSettings + */ + this.aoDestroyCallback = []; } /* @@ -1680,10 +1769,10 @@ * Purpose: Open a display row (append a row after the row in question) * Returns: node:nNewRow - the row opened * Inputs: node:nTr - the table row to 'open' - * string:sHtml - the HTML to put into the row + * string|node|jQuery:mHtml - the HTML to put into the row * string:sClass - class to give the new TD cell */ - this.fnOpen = function( nTr, sHtml, sClass ) + this.fnOpen = function( nTr, mHtml, sClass ) { /* Find settings from table node */ var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] ); @@ -1696,8 +1785,16 @@ nNewRow.appendChild( nNewCell ); nNewCell.className = sClass; nNewCell.colSpan = _fnVisbleColumns( oSettings ); - nNewCell.innerHTML = sHtml; - + + if( typeof mHtml.jquery != 'undefined' || typeof mHtml == "object" ) + { + nNewCell.appendChild( mHtml ); + } + else + { + nNewCell.innerHTML = mHtml; + } + /* If the nTr isn't on the page at the moment - then we don't insert at the moment */ var nTrs = $('tr', oSettings.nTBody); if ( $.inArray(nTr, nTrs) != -1 ) @@ -1745,16 +1842,15 @@ * Function: fnGetData * Purpose: Return an array with the data which is used to make up the table * Returns: array array string: 2d data array ([row][column]) or array string: 1d data array - * or - * array string (if iRow specified) + * or string if both row and column are given * Inputs: mixed:mRow - optional - if not present, then the full 2D array for the table * if given then: - * int: - return 1D array for aoData entry of this index - * node(TR): - return 1D array for this TR element - * Inputs: int:iRow - optional - if present then the array returned will be the data for - * the row with the index 'iRow' + * int: - return data object for aoData entry of this index + * node(TR): - return data object for this TR element + * int:iCol - optional - the column that you want the data of. This will take into + * account mDataProp and return the value DataTables uses for this column */ - this.fnGetData = function( mRow ) + this.fnGetData = function( mRow, iCol ) { var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] ); @@ -1762,7 +1858,13 @@ { var iRow = (typeof mRow == 'object') ? _fnNodeToDataIndex(oSettings, mRow) : mRow; - return oSettings.aoData[iRow]._aData; + + if ( typeof iCol != 'undefined' ) + { + return _fnGetCellData( oSettings, iRow, iCol, '' ); + } + return (typeof oSettings.aoData[iRow] != 'undefined') ? + oSettings.aoData[iRow]._aData : null; } return _fnGetDataMaster( oSettings ); }; @@ -1782,7 +1884,7 @@ if ( typeof iRow != 'undefined' ) { - return oSettings.aoData[iRow].nTr; + return (typeof oSettings.aoData[iRow] != 'undefined') ? oSettings.aoData[iRow].nTr : null; } return _fnGetTrNodes( oSettings ); }; @@ -1792,34 +1894,28 @@ * Purpose: Get the array indexes of a particular cell from it's DOM element * Returns: int: - row index, or array[ int, int, int ]: - row index, column index (visible) * and column index including hidden columns - * Inputs: node:nNode - this can either be a TR or a TD in the table, the return is + * Inputs: node:nNode - this can either be a TR, TD or TH in the table's body, the return is * dependent on this input */ this.fnGetPosition = function( nNode ) { var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] ); - var i; + var sNodeName = nNode.nodeName.toUpperCase(); - if ( nNode.nodeName.toUpperCase() == "TR" ) + if ( sNodeName == "TR" ) { return _fnNodeToDataIndex(oSettings, nNode); } - else if ( nNode.nodeName.toUpperCase() == "TD" ) + else if ( sNodeName == "TD" || sNodeName == "TH" ) { var iDataIndex = _fnNodeToDataIndex(oSettings, nNode.parentNode); - var iCorrector = 0; - for ( var j=0 ; jtr', oSettings.nTHead)[0]; - var nTrFoot = $('>tr', oSettings.nTFoot)[0]; - var anTheadTh = []; - var anTfootTh = []; - for ( i=0 ; i= _fnVisbleColumns( oSettings ) ) + bAppend = (iInsert >= _fnVisbleColumns( oSettings )); + + /* Which coloumn should we be inserting before? */ + if ( !bAppend ) { - nTrHead.appendChild( anTheadTh[iCol] ); - anTrs = $('>tr', oSettings.nTHead); - for ( i=1, iLen=anTrs.length ; itr', oSettings.nTFoot); - for ( i=1, iLen=anTrs.length ; itr', oSettings.nTHead); - for ( i=1, iLen=anTrs.length ; itr', oSettings.nTFoot); - for ( i=1, iLen=anTrs.length ; itd:eq('+iBefore+')', - oSettings.aoData[i].nTr)[0] ); + oSettings.aoData[i].nTr.appendChild( + oSettings.aoData[i]._anHidden[iCol] + ); + } + else + { + oSettings.aoData[i].nTr.insertBefore( + oSettings.aoData[i]._anHidden[iCol], + _fnGetTdNodes( oSettings, i )[iBefore] ); + } } } - - oSettings.aoColumns[iCol].bVisible = true; } else { /* Remove a column from display */ - nTrHead.removeChild( anTheadTh[iCol] ); - for ( i=0, iLen=oSettings.aoColumns[iCol].anThExtra.length ; i