diff -r 00bfb7b29d9e -r 391ad752903e src/pyams_skin/resources/js/myams-dataTables.js --- a/src/pyams_skin/resources/js/myams-dataTables.js Mon Jan 18 18:41:23 2016 +0100 +++ b/src/pyams_skin/resources/js/myams-dataTables.js Mon Jan 18 18:45:59 2016 +0100 @@ -5,7 +5,9 @@ */ -(function($) { +(function($, globals) { + + "use strict"; /** * Update default values for DataTables initialization @@ -86,9 +88,10 @@ // date-euro column sorter "date-euro-pre": function(a) { var trimmed = $.trim(a); - if (trimmed != '') { + var x; + if (trimmed !== '') { var frDate= trimmed.split('/'); - var x = (frDate[2] + frDate[1] + frDate[0]) * 1; + x = (frDate[2] + frDate[1] + frDate[0]) * 1; } else { x = 10000000; // = l'an 1000 ... } @@ -106,11 +109,12 @@ // datetime-euro column sorter "datetime-euro-pre": function(a) { var trimmed = $.trim(a); - if (trimmed != '') { + var x; + if (trimmed !== '') { var frDateTime = trimmed.split(' - '); var frDate= frDateTime[0].split('/'); var frTime = frDateTime[1].split(':'); - var x = (frDate[2] + frDate[1] + frDate[0] + frTime[0] + frTime[1]) * 1; + x = (frDate[2] + frDate[1] + frDate[0] + frTime[0] + frTime[1]) * 1; } else { x = 100000000000; // = l'an 1000 ... } @@ -136,8 +140,9 @@ var oLang = oSettings.oLanguage.oPaginate; var fnClickHandler = function (e) { e.preventDefault(); - if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) + if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) { fnDraw(oSettings); + } }; $(nPaging).append( @@ -183,7 +188,7 @@ // Add the new list items and their event handlers for (j=iStart ; j<=iEnd ; j++) { - sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; + sClass = (j === oPaging.iPage+1) ? 'class="active"' : ''; $('
  • '+j+'
  • ') .insertBefore( $('li:last', an[i])[0] ) .on('click', function (e) { @@ -194,15 +199,17 @@ } // Add / remove disabled classes from the static elements - if (oPaging.iPage === 0) + if (oPaging.iPage === 0) { $('li:first', an[i]).addClass('disabled'); - else + } else { $('li:first', an[i]).removeClass('disabled'); + } - if (oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0) + if (oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0) { $('li:last', an[i]).addClass('disabled'); - else + } else { $('li:last', an[i]).removeClass('disabled'); + } } } } @@ -218,8 +225,9 @@ var oLang = oSettings.oLanguage.oPaginate; var fnClickHandler = function (e) { e.preventDefault(); - if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) + if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) { fnDraw(oSettings); + } }; $(nPaging).append( @@ -269,14 +277,14 @@ // Add the new list items and their event handlers for (j=iStart ; j<=iEnd ; j++) { - sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; + sClass = (j === oPaging.iPage+1) ? 'class="active"' : ''; $('
  • '+j+'
  • ') .insertBefore( $('li.next', an[i])[0] ) .on('click', function (e) { e.preventDefault(); oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength; fnDraw( oSettings ); - } ); + }); } // Add / remove disabled classes from the static elements @@ -310,8 +318,9 @@ var oLang = oSettings.oLanguage.oPaginate; var fnClickHandler = function (e) { e.preventDefault(); - if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) + if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) { fnDraw(oSettings); + } }; $(nPaging).append( @@ -428,12 +437,17 @@ var BootstrapLength = function(oSettings, oInit) { - if (!this.CLASS || this.CLASS != 'BootstrapLength') - alert("Warning: BootstrapLength must be initialized with the 'new' keyword"); - if (typeof(oInit) == 'undefined') + if (!this.CLASS || this.CLASS !== 'BootstrapLength') { + if (globals.alert) { + globals.alert("Warning: BootstrapLength must be initialized with the 'new' keyword"); + } + } + if (typeof(oInit) === 'undefined') { oInit = {}; - if ($.fn.dataTable.camelToHungarian) + } + if ($.fn.dataTable.camelToHungarian) { $.fn.dataTable.camelToHungarian(BootstrapLength.defaults, oInit); + } this.s = { dt: null, @@ -447,8 +461,8 @@ }; BootstrapLength.aInstances.push(this); - this.s.dt = $.fn.dataTable.Api - ? new $.fn.dataTable.Api(oSettings).settings()[0] + this.s.dt = $.fn.dataTable.Api ? + new $.fn.dataTable.Api(oSettings).settings()[0] : oSettings; this._fnConstruct(oInit); @@ -471,22 +485,27 @@ _fnConstruct: function(init) { var self = this; var dt = self.s.dt; - if (dt.oScroll.bInfinite) + if (dt.oScroll.bInfinite) { return; + } var sName = dt.sTableId + '_length'; var sMenu = $('').attr('name', sName); var i, iLen; var aLengthMenu = dt.aLengthMenu; - if (aLengthMenu.length == 2 && typeof(aLengthMenu[0]) == 'object' && typeof(aLengthMenu[1]) == 'object') { - for (i=0, iLen=aLengthMenu[0].length; i < iLen; i++) + if (aLengthMenu.length === 2 && + typeof(aLengthMenu[0]) === 'object' && + typeof(aLengthMenu[1]) === 'object') { + for (i=0, iLen=aLengthMenu[0].length; i < iLen; i++) { $('