From 8bdcb2f616ba4bd5a03dfd8dcca5844c6c11dbff Mon Sep 17 00:00:00 2001 From: evilhero Date: Thu, 23 Aug 2018 20:44:31 -0400 Subject: [PATCH] replaced alphabetSearch.js with corrected one --- data/css/alphabetSearch.css | 0 data/interfaces/default/index.html | 4 +- data/js/alphabetSearch.js | 187 +++++++++++++++-------------- 3 files changed, 96 insertions(+), 95 deletions(-) mode change 100644 => 100755 data/css/alphabetSearch.css diff --git a/data/css/alphabetSearch.css b/data/css/alphabetSearch.css old mode 100644 new mode 100755 diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index c8ae24cf..a01d72db 100755 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -101,7 +101,7 @@ <%def name="headIncludes()"> - + <%def name="javascriptIncludes()"> @@ -114,7 +114,7 @@ $.fn.DataTable.ext.pager.numbers_length = 3; var table = $('#series_table').dataTable( { "destroy": true, - "sDom": '<"clear"Af><"clear"lp><"clear">rt<"clear"ip>', + "sDom": '<"clear"Af><"clear"lp><"clear">rt<"clear"ip>', "columnDefs": [ { "orderable": false, "targets": [5, 7, 10] }, { "visible": false, "targets": [5, 7, 10] }, diff --git a/data/js/alphabetSearch.js b/data/js/alphabetSearch.js index d9c25f89..f08bc58d 100644 --- a/data/js/alphabetSearch.js +++ b/data/js/alphabetSearch.js @@ -4,9 +4,9 @@ /** * @summary AlphabetSearch - * @description Show an alphabet aloneside a table providing search input options - * See http://datatables.net/blog/2014-09-22 for details - * @version 1.0.0 + * @description Show an alphabet aloneside a table providing search input options + * See http://datatables.net/blog/2014-09-22 for details + * @version 1.0.0 * @file dataTables.alphabetSearch.js * @author SpryMedia Ltd (www.sprymedia.co.uk) * @contact www.sprymedia.co.uk/contact @@ -26,137 +26,137 @@ // Search function $.fn.dataTable.Api.register( 'alphabetSearch()', function ( searchTerm ) { - this.iterator( 'table', function ( context ) { - context.alphabetSearch = searchTerm; - } ); + this.iterator( 'table', function ( context ) { + context.alphabetSearch = searchTerm; + } ); - return this; + return this; } ); // Recalculate the alphabet display for updated data $.fn.dataTable.Api.register( 'alphabetSearch.recalc()', function ( searchTerm ) { - this.iterator( 'table', function ( context ) { - draw( - new $.fn.dataTable.Api( context ), - $('div.alphabet', this.table().container()) - ); - } ); + this.iterator( 'table', function ( context ) { + draw( + new $.fn.dataTable.Api( context ), + $('div.alphabet', this.table().container()) + ); + } ); - return this; + return this; } ); -// Search plug-in +// Search plug-in $.fn.dataTable.ext.search.push( function ( context, searchData ) { - // Ensure that there is a search applied to this table before running it - if ( ! context.alphabetSearch ) { - return true; - } - if ( context.alphabetSearch.match('nonalpha') && !(searchData[1].charAt(0).match(/^[a-zA-Z]/ + // Ensure that there is a search applied to this table before running it + if ( ! context.alphabetSearch ) { + return true; + } + if ( context.alphabetSearch.match('nonalpha') && !(searchData[1].charAt(0).match(/^[a-zA-Z]/)) ) { return true; } if ( searchData[1].charAt(0) === context.alphabetSearch ) { - return true; - } + return true; + } - return false; + return false; } ); // Private support methods function bin ( data ) { - var letter, bins = {}; + var letter, bins = {}; var nonalpha = 0; bins['nonalpha'] = 0; for ( var i=0, ien=data.length ; i') - .data( 'letter', '' ) - .data( 'match-count', columnData.length ) - .html( 'None' ) - .appendTo( alphabet ); + $('') + .data( 'letter', '' ) + .data( 'match-count', columnData.length ) + .html( 'None' ) + .appendTo( alphabet ); - $('') - .data( 'letter', 'nonalpha' ) - .data( 'match-count', bins['nonalpha'] || 0 ) - .html( '0-9' ) - .appendTo( alphabet ); + $('') + .data( 'letter', 'nonalpha' ) + .data( 'match-count', bins['nonalpha'] || 0 ) + .html( '0-9' ) + .appendTo( alphabet ); - for ( var i=0 ; i<26 ; i++ ) { - var letter = String.fromCharCode( 65 + i ); + for ( var i=0 ; i<26 ; i++ ) { + var letter = String.fromCharCode( 65 + i ); - $('') - .data( 'letter', letter ) - .data( 'match-count', bins[letter] || 0 ) - .addClass( ! bins[letter] ? 'empty' : '' ) - .html( letter ) - .appendTo( alphabet ); - } + $('') + .data( 'letter', letter ) + .data( 'match-count', bins[letter] || 0 ) + .addClass( ! bins[letter] ? 'empty' : '' ) + .html( letter ) + .appendTo( alphabet ); + } - $('
') - .appendTo( alphabet ); + $('
') + .appendTo( alphabet ); } $.fn.dataTable.AlphabetSearch = function ( context ) { - var table = new $.fn.dataTable.Api( context ); - var alphabet = $('
'); + var table = new $.fn.dataTable.Api( context ); + var alphabet = $('
'); - draw( table, alphabet ); + draw( table, alphabet ); - // Trigger a search - alphabet.on( 'click', 'span', function () { - alphabet.find( '.active' ).removeClass( 'active' ); - $(this).addClass( 'active' ); + // Trigger a search + alphabet.on( 'click', 'span', function () { + alphabet.find( '.active' ).removeClass( 'active' ); + $(this).addClass( 'active' ); table - .alphabetSearch( $(this).data('letter') ) - .draw(); - } ); + .alphabetSearch( $(this).data('letter') ) + .draw(); + } ); - // Mouse events to show helper information - alphabet - .on( 'mouseenter', 'span', function () { - alphabet - .find('div.alphabetInfo') - .css( { - opacity: 1, - left: $(this).position().left, - width: $(this).width() - } ) - .html( $(this).data('match-count') ); - } ) - .on( 'mouseleave', 'span', function () { - alphabet - .find('div.alphabetInfo') - .css('opacity', 0); - } ); + // Mouse events to show helper information + alphabet + .on( 'mouseenter', 'span', function () { + alphabet + .find('div.alphabetInfo') + .css( { + opacity: 1, + left: $(this).position().left, + width: $(this).width() + } ) + .html( $(this).data('match-count') ); + } ) + .on( 'mouseleave', 'span', function () { + alphabet + .find('div.alphabetInfo') + .css('opacity', 0); + } ); - // API method to get the alphabet container node - this.node = function () { - return alphabet; - }; + // API method to get the alphabet container node + this.node = function () { + return alphabet; + }; }; $.fn.DataTable.AlphabetSearch = $.fn.dataTable.AlphabetSearch; @@ -164,12 +164,13 @@ $.fn.DataTable.AlphabetSearch = $.fn.dataTable.AlphabetSearch; // Register a search plug-in $.fn.dataTable.ext.feature.push( { - fnInit: function ( settings ) { - var search = new $.fn.dataTable.AlphabetSearch( settings ); - return search.node(); - }, - cFeature: 'A' + fnInit: function ( settings ) { + var search = new $.fn.dataTable.AlphabetSearch( settings ); + return search.node(); + }, + cFeature: 'A' } ); }()); +