From 06dbcfbcf8debd937da28dd1c872a06dba609582 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 14 Feb 2013 17:18:45 +0000 Subject: [PATCH 01/12] Shorten Greek translation of 'Scheduled Play' (CC-4947) --- .../locale/el_GR/LC_MESSAGES/airtime.mo | Bin 83258 -> 83221 bytes .../locale/el_GR/LC_MESSAGES/airtime.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo index 98a3e9ae6906ce82467d0647d9cc044af4d1b273..81ea07d40772d415547a6327b20dee6717f7508e 100644 GIT binary patch delta 2256 zcmXZdeN5F=9LMo=e%ng|;(chP8zuqGBef_C8p#6!V&7PSCRq+3`rrV{64HEu?|{|;8+FzN&5 zQ4@KhtjWi?71d#xNN#VIA|EIT~Sf6ee1;7|Spp>rn&0gc@J~ zm9mqlOr1uh_#Eo}ix`4eQ8jf9^#Q-2KIjju#OS5g|Db9kvcNspipp3g>iHhj7F-C>P>K^*S+fo|qR#KZpx3dC*uUD{ zfV)r&?MDqX5%h0VRp%ADls}G2^)}S0*?~IddoTujP_-2}PD3f2N2M%&joYg#)bZJX z%E)Ha#4q9v`~XAn^&)rt-at(_fVv-sa2I|X{Jpf;Jy(m`q6VZc1Lj#8N>#t#nr58C zhw=Wk)->TD*5IG0ttcvSzwbspKZ%DhqtqR@F?@nJYn?T%*p2$qzi=zol(||sj_Y*( zXJ~ZtLt42zUMKM|v8Te_-2tOAu1!MQJEM+T~y~$MSdmd z4C=Uhs<;7}-_+A6#6DCle1{tFKMcc&YFDlCsAH9dnxGW5Wp${Ox1&x+AL_WCMU8U_ z7vMB%fxn`z=9?JMK(@vW7>?TWIMm8hgYjzg5LaUfu1CH1D#qdg)W7TZ@kzWL>~E}f zHPeDx&_UFD$57*cQfrfpj@21Dw9=nY1J0uEe9ve?fq!dQL7}gpxTL^8+T8cr9`9uL V<ycm&h&qhLINsl?aOhf&kqdkfJ+ zyb9-H8;)WR7U8;R8!-3K=!&)`0S^WJ03ReC3&t@qZUH{j!fG%J*WxnVfqMTeR^s=l z=RC1)A|K`xKaM%L54F%wVguHs(D;cCKi&zNALj;YK`;HsP%n&PCSJp5F>bmw(YO<} z;4U1&A2AFM#=9>+in+vJVJP0h`|wVHh87Sp!%&WM{%>)ntgZFdje^&lPOInEPD{H{x@|owx>VmNmUtk5?4?tT~0hU=zNT z?P|;9SW`>fiUIb(4AQ8;+o;qnnd4GijoR}y7>ln4`wyeG>Rk*aBZH_tJvG;wd3YIB zq>;HUlPRci(@{m4jU8B!%lX%Z(o07xo=2r9XP&!gp2r2mU8w3lk6Ac{i}Bw1uIQ>! z3)qA@C3{d?+KVdY?@(LvH+peNo~x-R@;Lu`U<(~O->;+MGpLkLVI@ZAy9sJh3*L&l z**dWVkKt0h6#PBa?`mTq>bbqBj2%ZkKY-eTYXKTc@zMp>l;L*N`RxxHUSLf*aTDqa zK8#xEFlwNwpvi@8+FW&;tU)>)mGpFjZ7Mzg)U{~sJ(g;b$p&d zWn>3x;y3VT`~o%6`$g{fokUGIg1R5Za6A4Q{Jpu@J+~3HMO%=%44C~ibc}{etZBr! zMbbBxB)bB@7&;N<9;mXDCxJ_a+@#->b+VDfvmnN0F8?X(lh%aE7 z&VTe0Yj)D{5H{dAcB5~pySqnFFI+`sCbz;}%>}rbxCwQ$eTmA*MN}pxQ5V&3sG7MM zG`i9qcOTX;ziFpYh(oAa_yaXy#xj?(LevddjyhJWQ4=(ys(dpl)~ zz`M~dcMA+fUCj{~&_G!}2*wR~7x7bAiknc+zk>J?;ztElj aPyE5O92*ug\n" "POT-Creation-Date: 2013-02-07 16:22-0500\n" -"PO-Revision-Date: 2013-02-08 11:13+0100\n" +"PO-Revision-Date: 2013-02-14 17:18+0100\n" "Last-Translator: Daniel James \n" "Language-Team: Greek Localization \n" "Language: el_GR\n" @@ -2867,7 +2867,7 @@ msgstr "Εμφάνιση Πηγής " #: airtime_mvc/application/views/scripts/partialviews/header.phtml:45 msgid "Scheduled Play" -msgstr "Προγραμματισμένη Αναπαραγωγή" +msgstr "Πρόγραμμα" #: airtime_mvc/application/views/scripts/partialviews/header.phtml:54 msgid "ON AIR" From bb7e56e39e8a8bb0a05c371581236a50d133b6d8 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 14 Feb 2013 12:58:31 -0500 Subject: [PATCH 02/12] CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned -fixed --- airtime_mvc/public/js/airtime/dashboard/dashboard.js | 6 ++++-- airtime_mvc/public/js/airtime/library/library.js | 5 +++-- .../public/js/airtime/preferences/streamsetting.js | 8 +++++--- .../public/js/airtime/schedule/full-calendar-functions.js | 6 ++++-- airtime_mvc/public/js/airtime/schedule/schedule.js | 4 +++- airtime_mvc/public/js/airtime/showbuilder/main_builder.js | 3 ++- airtime_mvc/public/js/airtime/status/status.js | 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 3b2cad458..38d357523 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -360,13 +360,15 @@ function controlSwitchLight(){ } function getScheduleFromServer(){ - $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ + $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", + dataType:"json", + success:function(data){ parseItems(data.entries); parseSourceStatus(data.source_status); parseSwitchStatus(data.switch_status); showName = data.show_name; + setTimeout(getScheduleFromServer, serverUpdateInterval); }, error:function(jqXHR, textStatus, errorThrown){}}); - setTimeout(getScheduleFromServer, serverUpdateInterval); } function setupQtip(){ diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index aae972017..dd0574a03 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -768,8 +768,7 @@ var AIRTIME = (function(AIRTIME) { }); checkImportStatus(); - setInterval(checkImportStatus, 5000); - setInterval(checkLibrarySCUploadStatus, 5000); + checkLibrarySCUploadStatus(); addQtipToSCIcons(); @@ -997,6 +996,7 @@ function checkImportStatus() { } div.hide(); } + setTimeout(checkImportStatus, 5000); }); } @@ -1030,6 +1030,7 @@ function checkLibrarySCUploadStatus(){ else if (json.sc_id == "-3") { span.removeClass("progress").addClass("sc-error"); } + setTimeout(checkLibrarySCUploadStatus, 5000); } function checkSCUploadStatusRequest() { diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 6e76b693c..31724ac8d 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -103,6 +103,8 @@ function checkLiquidsoapStatus(){ } $("#s"+id+"Liquidsoap-error-msg-element").html(html); } + + setTimeout(checkLiquidsoapStatus, 2000); }); } @@ -242,10 +244,10 @@ function setupEventListeners() { return false; }) - setLiveSourceConnectionOverrideListener() + setLiveSourceConnectionOverrideListener(); - showErrorSections() - setInterval('checkLiquidsoapStatus()', 1000) + showErrorSections(); + checkLiquidsoapStatus(); // qtip for help text $(".override_help_icon").qtip({ diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 192d811fe..0dd4a5484 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -372,6 +372,7 @@ function checkSCUploadStatus(){ }else if(json.sc_id == "-3"){ $("span[id="+id+"]:not(.recording)").removeClass("progress").addClass("sc-error"); } + setTimeout(checkSCUploadStatus, 5000); }); }); } @@ -424,6 +425,7 @@ function getCurrentShow(){ $(this).remove("span[small-icon now-playing]"); } }); + setTimeout(getCurrentShow, 5000); }); } @@ -564,8 +566,8 @@ function alertShowErrorAndReload(){ preloadEventFeed(); $(document).ready(function(){ - setInterval( "checkSCUploadStatus()", 5000 ); - setInterval( "getCurrentShow()", 5000 ); + checkSCUploadStatus(); + getCurrentShow(); }); var view_name; diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index 3c4f9fd3b..edcf183f0 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -93,6 +93,8 @@ function checkCalendarSCUploadStatus(){ else if (json.sc_id == "-3") { span.removeClass("progress").addClass("sc-error"); } + + setTimeout(checkCalendarSCUploadStatus, 5000); } function checkSCUploadStatusRequest() { @@ -328,7 +330,7 @@ function alertShowErrorAndReload(){ } $(document).ready(function() { - setInterval(checkCalendarSCUploadStatus, 5000); + checkCalendarSCUploadStatus(); $.contextMenu({ selector: 'div.fc-event', diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 214bc9714..98a1915a5 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -277,12 +277,13 @@ AIRTIME = (function(AIRTIME) { if (json.update === true) { oTable.fnDraw(); } + setTimeout(checkScheduleUpdates, 5000); } }); } //check if the timeline view needs updating. - setInterval(checkScheduleUpdates, 5 * 1000); //need refresh in milliseconds + checkScheduleUpdates(); }; mod.onResize = function() { diff --git a/airtime_mvc/public/js/airtime/status/status.js b/airtime_mvc/public/js/airtime/status/status.js index 9b5e4d3ea..ef3358e7a 100644 --- a/airtime_mvc/public/js/airtime/status/status.js +++ b/airtime_mvc/public/js/airtime/status/status.js @@ -66,6 +66,7 @@ function success(data, textStatus, jqXHR){ if (data.status.partitions){ generatePartitions(data.status.partitions); } + setTimeout(function(){updateStatus(false);}, 5000); } function updateStatus(getDiskInfo){ @@ -75,5 +76,4 @@ function updateStatus(getDiskInfo){ $(document).ready(function() { updateStatus(true); - setInterval(function(){updateStatus(false);}, 5000); }); From 1b5b7ae1f72476a1bf86483c8df282f264f007f6 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 14 Feb 2013 13:31:22 -0500 Subject: [PATCH 03/12] Stopped refetching calendar events when calendar is resized --- airtime_mvc/public/js/airtime/schedule/add-show.js | 10 +++++----- .../js/airtime/schedule/full-calendar-functions.js | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 4f33ccdc7..a1f053699 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -406,10 +406,9 @@ function setAddShowEvents() { event.stopPropagation(); event.preventDefault(); - $("#schedule_calendar").removeAttr("style") - .fullCalendar('render'); - $("#add-show-form").hide(); + windowResize(); + $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){ $("#add-show-form") .empty() @@ -652,13 +651,14 @@ function windowResize() { var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100); var widthPercent = parseInt(calendarWidth)+"%"; $("#schedule_calendar").css("width", widthPercent); + } else { + $("#schedule_calendar").css("width", 98.5+"%"); } // 200 px for top dashboard and 50 for padding on main content // this calculation was copied from schedule.js line 326 var mainHeight = document.documentElement.clientHeight - 200 - 50; - $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight) - $("#schedule_calendar").fullCalendar('render'); + $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight); } diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 192d811fe..8f0a6cb0d 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -28,7 +28,11 @@ function openAddShowForm() { var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100); var widthPercent = parseInt(calendarWidth)+"%"; $("#schedule_calendar").css("width", widthPercent); - $("#schedule_calendar").fullCalendar('render'); + + // 200 px for top dashboard and 50 for padding on main content + // this calculation was copied from schedule.js line 326 + var mainHeight = document.documentElement.clientHeight - 200 - 50; + $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight); } $("#schedule-show-what").show(0, function(){ $add_show_name = $("#add_show_name"); From b3ab84db2e435d43c8462a9387555b16d221f8b4 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 14 Feb 2013 13:33:18 -0500 Subject: [PATCH 04/12] add minified datatables.js and upgrade from 1.9.1 to 1.9.4 --- .../js/datatables/js/jquery.dataTables.js | 11973 +--------------- 1 file changed, 145 insertions(+), 11828 deletions(-) diff --git a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js index ab61ea58e..02694a4a5 100644 --- a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js +++ b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js @@ -1,12 +1,10 @@ -/** - * @summary DataTables - * @description Paginate, search and sort HTML tables - * @version 1.9.1 - * @file jquery.dataTables.js - * @author Allan Jardine (www.sprymedia.co.uk) - * @contact www.sprymedia.co.uk/contact - * - * @copyright Copyright 2008-2012 Allan Jardine, all rights reserved. +/* + * File: jquery.dataTables.min.js + * Version: 1.9.4 + * Author: Allan Jardine (www.sprymedia.co.uk) + * Info: www.datatables.net + * + * Copyright 2008-2012 Allan Jardine, all rights reserved. * * This source file is free software, under either the GPL v2 license or a * BSD style license, available at: @@ -16,11823 +14,142 @@ * This source file is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details. - * - * For details please refer to: http://www.datatables.net */ - -/*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,_fnCallbackReg,_fnCallbackFire,_fnJsonString,_fnRender,_fnNodeToColumnIndex,_fnInfoMacros*/ - -(/** @lends */function($, window, document, undefined) { - /** - * DataTables is a plug-in for the jQuery Javascript library. It is a - * highly flexible tool, based upon the foundations of progressive - * enhancement, which will add advanced interaction controls to any - * HTML table. For a full list of features please refer to - * DataTables.net. - * - * Note that the DataTable object is not a global variable but is - * aliased to jQuery.fn.DataTable and jQuery.fn.dataTable through which - * it may be accessed. - * - * @class - * @param {object} [oInit={}] Configuration object for DataTables. Options - * are defined by {@link DataTable.defaults} - * @requires jQuery 1.3+ - * - * @example - * // Basic initialisation - * $(document).ready( function { - * $('#example').dataTable(); - * } ); - * - * @example - * // Initialisation with configuration options - in this case, disable - * // pagination and sorting. - * $(document).ready( function { - * $('#example').dataTable( { - * "bPaginate": false, - * "bSort": false - * } ); - * } ); - */ - var DataTable = function( oInit ) - { - - - /** - * Add a column to the list used for the table with default values - * @param {object} oSettings dataTables settings object - * @param {node} nTh The th element for this column - * @memberof DataTable#oApi - */ - function _fnAddColumn( oSettings, nTh ) - { - var oDefaults = DataTable.defaults.columns; - var iCol = oSettings.aoColumns.length; - var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, { - "sSortingClass": oSettings.oClasses.sSortable, - "sSortingClassJUI": oSettings.oClasses.sSortJUI, - "nTh": nTh ? nTh : document.createElement('th'), - "sTitle": oDefaults.sTitle ? oDefaults.sTitle : nTh ? nTh.innerHTML : '', - "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol], - "mDataProp": oDefaults.mDataProp ? oDefaults.oDefaults : iCol - } ); - oSettings.aoColumns.push( oCol ); - - /* Add a column specific filter */ - if ( oSettings.aoPreSearchCols[ iCol ] === undefined || oSettings.aoPreSearchCols[ iCol ] === null ) - { - oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch ); - } - else - { - var oPre = oSettings.aoPreSearchCols[ iCol ]; - - /* Don't require that the user must specify bRegex, bSmart or bCaseInsensitive */ - if ( oPre.bRegex === undefined ) - { - oPre.bRegex = true; - } - - if ( oPre.bSmart === undefined ) - { - oPre.bSmart = true; - } - - if ( oPre.bCaseInsensitive === undefined ) - { - oPre.bCaseInsensitive = true; - } - } - - /* Use the column options function to initialise classes etc */ - _fnColumnOptions( oSettings, iCol, null ); - } - - - /** - * Apply options for a column - * @param {object} oSettings dataTables settings object - * @param {int} iCol column index to consider - * @param {object} oOptions object with sType, bVisible and bSearchable - * @memberof DataTable#oApi - */ - function _fnColumnOptions( oSettings, iCol, oOptions ) - { - var oCol = oSettings.aoColumns[ iCol ]; - - /* User specified column options */ - if ( oOptions !== undefined && oOptions !== null ) - { - if ( oOptions.sType !== undefined ) - { - oCol.sType = oOptions.sType; - oCol._bAutoType = false; - } - - $.extend( oCol, oOptions ); - _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" ); - - /* iDataSort to be applied (backwards compatibility), but aDataSort will take - * priority if defined - */ - if ( oOptions.iDataSort !== undefined ) - { - oCol.aDataSort = [ oOptions.iDataSort ]; - } - _fnMap( oCol, oOptions, "aDataSort" ); - } - - /* Cache the data get and set functions for speed */ - oCol.fnGetData = _fnGetObjectDataFn( oCol.mDataProp ); - oCol.fnSetData = _fnSetObjectDataFn( oCol.mDataProp ); - - /* Feature sorting overrides column specific when off */ - if ( !oSettings.oFeatures.bSort ) - { - oCol.bSortable = false; - } - - /* Check that the class assignment is correct for sorting */ - if ( !oCol.bSortable || - ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) ) - { - oCol.sSortingClass = oSettings.oClasses.sSortableNone; - oCol.sSortingClassJUI = ""; - } - else if ( oCol.bSortable || - ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) ) - { - oCol.sSortingClass = oSettings.oClasses.sSortable; - oCol.sSortingClassJUI = oSettings.oClasses.sSortJUI; - } - else if ( $.inArray('asc', oCol.asSorting) != -1 && $.inArray('desc', oCol.asSorting) == -1 ) - { - oCol.sSortingClass = oSettings.oClasses.sSortableAsc; - oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIAscAllowed; - } - else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) != -1 ) - { - oCol.sSortingClass = oSettings.oClasses.sSortableDesc; - oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIDescAllowed; - } - } - - - /** - * Adjust the table column widths for new data. Note: you would probably want to - * do a redraw after calling this function! - * @param {object} oSettings dataTables settings object - * @memberof DataTable#oApi - */ - function _fnAdjustColumnSizing ( oSettings ) - { - /* Not interested in doing column width calculation if autowidth is disabled */ - if ( oSettings.oFeatures.bAutoWidth === false ) - { - return false; - } - - _fnCalculateColumnWidths( oSettings ); - for ( var i=0 , iLen=oSettings.aoColumns.length ; i