diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 2e38402f..ae1dec69 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -1,18 +1,16 @@ -/* - * File: jquery.dataTables.js - * Version: 1.9.0.dev - * Description: Paginate, search and sort HTML tables - * Author: Allan Jardine (www.sprymedia.co.uk) - * Created: 28/3/2008 - * Language: Javascript - * License: GPL v2 or BSD 3 point style - * Project: Mtaala - * Contact: allan.jardine@sprymedia.co.uk - * - * Copyright 2008-2011 Allan Jardine, all rights reserved. +/** + * @summary DataTables + * @description Paginate, search and sort HTML tables + * @version 1.9.0.dev + * @author Allan Jardine (www.sprymedia.co.uk) + * @contact www.sprymedia.co.uk/contact + * + * @copyright 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, as supplied with this software. + * BSD style license, available at: + * http://datatables.net/license_gpl2 + * http://datatables.net/license_bsd * * This source file is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY @@ -21,9 +19,6 @@ * For details please refer to: http://www.datatables.net */ -/* - * 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,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_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,_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,_fnApplyColumnDefs,_fnBindAction*/ diff --git a/media/src/DataTables.js b/media/src/DataTables.js index 9067e2c5..d8bd2c42 100644 --- a/media/src/DataTables.js +++ b/media/src/DataTables.js @@ -1,18 +1,16 @@ -/* - * File: jquery.dataTables.js - * Version: 1.9.0.dev - * Description: Paginate, search and sort HTML tables - * Author: Allan Jardine (www.sprymedia.co.uk) - * Created: 28/3/2008 - * Language: Javascript - * License: GPL v2 or BSD 3 point style - * Project: Mtaala - * Contact: allan.jardine@sprymedia.co.uk - * - * Copyright 2008-2011 Allan Jardine, all rights reserved. +/** + * @summary DataTables + * @description Paginate, search and sort HTML tables + * @version 1.9.0.dev + * @author Allan Jardine (www.sprymedia.co.uk) + * @contact www.sprymedia.co.uk/contact + * + * @copyright 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, as supplied with this software. + * BSD style license, available at: + * http://datatables.net/license_gpl2 + * http://datatables.net/license_bsd * * This source file is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY @@ -21,9 +19,6 @@ * For details please refer to: http://www.datatables.net */ -/* - * 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,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_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,_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,_fnApplyColumnDefs,_fnBindAction*/ diff --git a/scripts/make.sh b/scripts/make.sh index b0a68bb8..acb7e63d 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -9,7 +9,7 @@ CMD=$1 MAIN_FILE="../js/jquery.dataTables.js" MIN_FILE="../js/jquery.dataTables.min.js" -VERSION=$(grep " * Version: " DataTables.js | awk -F" " '{ print $3 }') +VERSION=$(grep " * @version " DataTables.js | awk -F" " '{ print $3 }') echo "" echo " DataTables build ($VERSION)"