app/assets/javascripts/adminpanel/tables.js in adminpanel-3.2.1 vs app/assets/javascripts/adminpanel/tables.js in adminpanel-3.3.0

- old
+ new

@@ -1,130 +1,135 @@ $.extend( $.fn.dataTableExt.oPagination, { - "bootstrap": { - "fnInit": function( oSettings, nPaging, fnDraw ) { - var oLang = oSettings.oLanguage.oPaginate; - var fnClickHandler = function ( e ) { - e.preventDefault(); - if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) { - fnDraw( oSettings ); - } - }; + "bootstrap": { + "fnInit": function( oSettings, nPaging, fnDraw ) { + var oLang = oSettings.oLanguage.oPaginate; + var fnClickHandler = function ( e ) { + e.preventDefault(); + if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) { + fnDraw( oSettings ); + } + }; - $(nPaging).addClass('pagination').append( - '<ul>'+ - '<li class="prev disabled"><a href="#">&larr; '+oLang.sPrevious+'</a></li>'+ - '<li class="next disabled"><a href="#">'+oLang.sNext+' &rarr; </a></li>'+ - '</ul>' - ); - var els = $('a', nPaging); - $(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler ); - $(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler ); - }, + $(nPaging).addClass('pagination').append( + '<ul>'+ + '<li class="prev disabled"><a href="#">&larr; '+oLang.sPrevious+'</a></li>'+ + '<li class="next disabled"><a href="#">'+oLang.sNext+' &rarr; </a></li>'+ + '</ul>' + ); + var els = $('a', nPaging); + $(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler ); + $(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler ); + }, - "fnUpdate": function ( oSettings, fnDraw ) { - var iListLength = 5; - var oPaging = oSettings.oInstance.fnPagingInfo(); - var an = oSettings.aanFeatures.p; - var i, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2); + "fnUpdate": function ( oSettings, fnDraw ) { + var iListLength = 5; + var oPaging = oSettings.oInstance.fnPagingInfo(); + var an = oSettings.aanFeatures.p; + var i, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2); - if ( oPaging.iTotalPages < iListLength) { - iStart = 1; - iEnd = oPaging.iTotalPages; - } - else if ( oPaging.iPage <= iHalf ) { - iStart = 1; - iEnd = iListLength; - } else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) { - iStart = oPaging.iTotalPages - iListLength + 1; - iEnd = oPaging.iTotalPages; - } else { - iStart = oPaging.iPage - iHalf + 1; - iEnd = iStart + iListLength - 1; - } + if ( oPaging.iTotalPages < iListLength) { + iStart = 1; + iEnd = oPaging.iTotalPages; + } + else if ( oPaging.iPage <= iHalf ) { + iStart = 1; + iEnd = iListLength; + } else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) { + iStart = oPaging.iTotalPages - iListLength + 1; + iEnd = oPaging.iTotalPages; + } else { + iStart = oPaging.iPage - iHalf + 1; + iEnd = iStart + iListLength - 1; + } - for ( i=0, iLen=an.length ; i<iLen ; i++ ) { - // Remove the middle elements - $('li:gt(0)', an[i]).filter(':not(:last)').remove(); + for ( i=0, iLen=an.length ; i<iLen ; i++ ) { + // Remove the middle elements + $('li:gt(0)', an[i]).filter(':not(:last)').remove(); - // Add the new list items and their event handlers - for ( j=iStart ; j<=iEnd ; j++ ) { - sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; - $('<li '+sClass+'><a href="#">'+j+'</a></li>') - .insertBefore( $('li:last', an[i])[0] ) - .bind('click', function (e) { - e.preventDefault(); - oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength; - fnDraw( oSettings ); - } ); - } + // Add the new list items and their event handlers + for ( j=iStart ; j<=iEnd ; j++ ) { + sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; + $('<li '+sClass+'><a href="#">'+j+'</a></li>') + .insertBefore( $('li:last', an[i])[0] ) + .bind('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 - if ( oPaging.iPage === 0 ) { - $('li:first', an[i]).addClass('disabled'); - } else { - $('li:first', an[i]).removeClass('disabled'); - } + // Add / remove disabled classes from the static elements + if ( oPaging.iPage === 0 ) { + $('li:first', an[i]).addClass('disabled'); + } else { + $('li:first', an[i]).removeClass('disabled'); + } - if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) { - $('li:last', an[i]).addClass('disabled'); - } else { - $('li:last', an[i]).removeClass('disabled'); - } - } - } - } - } ); + if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) { + $('li:last', an[i]).addClass('disabled'); + } else { + $('li:last', an[i]).removeClass('disabled'); + } + } + } + } + } ); $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) { - return { - "iStart": oSettings._iDisplayStart, - "iEnd": oSettings.fnDisplayEnd(), - "iLength": oSettings._iDisplayLength, - "iTotal": oSettings.fnRecordsTotal(), - "iFilteredTotal": oSettings.fnRecordsDisplay(), - "iPage": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), - "iTotalPages": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) - }; + return { + "iStart": oSettings._iDisplayStart, + "iEnd": oSettings.fnDisplayEnd(), + "iLength": oSettings._iDisplayLength, + "iTotal": oSettings.fnRecordsTotal(), + "iFilteredTotal": oSettings.fnRecordsDisplay(), + "iPage": oSettings._iDisplayLength === -1 ? + 0 : Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), + "iTotalPages": oSettings._iDisplayLength === -1 ? + 0 : Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) + }; }; jQuery.fn.dataTableExt.aTypes.push( - function ( sData ) { - return 'html'; - } + function ( sData ) { + return 'html'; + } ); function SwitchCalendars(startCalendar, endCalendar, e) { - var endCalendarDate = new Date(e.date), - endCalendarInput = $('#end_date'); + var endCalendarDate = new Date(e.date), + endCalendarInput = $('#end_date'); - startCalendar.datepicker('hide'); - endCalendarDate.setDate(endCalendarDate.getDate() + 1); - endCalendar.datepicker('setStartDate', endCalendarDate); - endCalendar.datepicker('update', endCalendarDate); - endCalendar.focus(); - endCalendar.datepicker('show'); + startCalendar.datepicker('hide'); + endCalendarDate.setDate(endCalendarDate.getDate() + 1); + endCalendar.datepicker('setStartDate', endCalendarDate); + endCalendar.datepicker('update', endCalendarDate); + endCalendar.focus(); + endCalendar.datepicker('show'); } var ready = function() { - $('#information-table').dataTable({ - "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - "oLanguage": { - "sLengthMenu": "Registros: _MENU_ ", - "sZeroRecords": "No se encontró ningún registro que coincida con su búsqueda", - "sInfo": "Mostrando registros del _START_ al _END_ (_TOTAL_ registros en total)", - "sInfoEmpty": "No hay entradas para mostrar", - "sInfoFiltered": "(_MAX_ registros fueron filtrados)", - "sSearch": "Buscar:", - "oPaginate" : { - "sPrevious": "Anterior", - "sNext": "Siguiente" - } - }, - "bDestroy": true - }); + $('#information-table').dataTable({ + "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", + "sPaginationType": "bootstrap", + "oLanguage": { + "sLengthMenu": "Registros: _MENU_ ", + "sZeroRecords": "No se encontró ningún registro que coincida con su búsqueda", + "sInfo": "Mostrando registros del _START_ al _END_ (_TOTAL_ registros en total)", + "sInfoEmpty": "No hay entradas para mostrar", + "sInfoFiltered": "(_MAX_ registros fueron filtrados)", + "sSearch": "Buscar:", + "oPaginate" : { + "sPrevious": "Anterior", + "sNext": "Siguiente" + } + }, + "bRetrieve": true + }); } -$(document).ready(ready); -$(document).on('page:load', ready); +$(document).on('turbolinks:render', ready); +$(document).on('turbolinks:before-cache', function(){ + if ($('#information-table').length) { + var dt = $('#information-table').dataTable({ "bRetrieve": true }); + dt.fnDestroy(); + } +});