jquery-datatables 1.10.17 → 1.10.18

data/app/assets/javascripts/datatables/plugins/search/{alphabetSearch.js → dataTables.alphabetSearch.js}

@@ -1,4 +1,4 @@
-/*! AlphabetSearch for DataTables v1.1.2
+/*! AlphabetSearch for DataTables v1.2.4
  * 2014 SpryMedia Ltd - datatables.net/license
  * Gyrocode - MIT License
  */
@@ -7,7 +7,7 @@
  * @summary     AlphabetSearch
  * @description Show an set of alphabet buttons alongside a table providing
  *     search input options
- * @version     1.1.1
+ * @version     1.2.4
  * @file        dataTables.alphabetSearch.js
  * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
@@ -19,7 +19,7 @@
  * License      MIT - http://datatables.net/license/mit
  *
  * For more detailed information please see:
- *     http://www.gyrocode.com/articles/jquery-datatables-alphabetical-search
+ * https://www.gyrocode.com/projects/jquery-datatables-alphabetsearch/
  */
 (function(){
 
@@ -34,7 +34,7 @@ $.fn.dataTable.Api.register( 'alphabetSearch()', function ( searchTerm ) {
 } );
 
 // Recalculate the alphabet display for updated data
-$.fn.dataTable.Api.register( 'alphabetSearch.recalc()', function ( searchTerm ) {
+$.fn.dataTable.Api.register( 'alphabetSearch.recalc()', function () {
 	this.iterator( 'table', function ( context ) {
 		draw(
 			new $.fn.dataTable.Api( context ),
@@ -49,6 +49,11 @@ $.fn.dataTable.Api.register( 'alphabetSearch.recalc()', function ( searchTerm )
 
 // Search plug-in
 $.fn.dataTable.ext.search.push( function ( context, searchData ) {
+	// Ensure that table has alphabet search feature enabled
+	if ( ! context.hasOwnProperty('alphabetSearch') ) {
+		return true;
+	}
+
 	// Ensure that there is a search applied to this table before running it
 	if ( ! context.alphabetSearch.letterSearch ) {
 		return true;
@@ -80,7 +85,7 @@ $.fn.dataTable.ext.search.push( function ( context, searchData ) {
 // there would be two calls to this method
 $.fn.dataTable.ext.order['alphabetSearch'] = function  ( context, col )
 {
-	var order_col    = this.api().order()[0][0];
+	var order_col = this.api().order()[0][0];
 	var order_method = this.api().order()[0][1];
 
 	// If sorting by column other than the one being alphabetized
@@ -89,28 +94,29 @@ $.fn.dataTable.ext.order['alphabetSearch'] = function  ( context, col )
 	}
 
 	var data = this.api().column( col, { order: 'index' } ).data().map( function (value, index) {
+		var letter = value.replace(/<.*?>/g, '').charAt(0).toUpperCase();
+
 		// If sorting by alphabetized column
 		return (order_col === context.alphabetSearch.column)
-			? (
-				// If first pass
-				( !context.alphabetSearch.pass )
-					// Ignore
-					?
-						''
-					// Otherwise, if it's a second pass
-					:
-						(
-							// If method is ascending sort
-							( order_method === 'asc' )
-								// Return first letter
-								? value.charAt(0)
-								: String.fromCharCode(65535 - value.charCodeAt(0))
-						)
-			)
-			// Otherwise, if sorting by column other than the one being alphabetized,
-			// return first letter
-			: value.charAt(0);
-
+		? (
+			// If first pass
+			( !context.alphabetSearch.pass )
+				// Ignore
+				?
+					''
+				// Otherwise, if it's a second pass
+				:
+					(
+					// If method is ascending sort
+					( order_method === 'asc' )
+						// Return first letter
+						? letter
+						: String.fromCharCode(65535 - letter.charCodeAt(0))
+					)
+		)
+		// Otherwise, if sorting by column other than the one being alphabetized,
+		// return first letter
+		: letter;
 	} );
 
 	// If sorting by alphabetized column
@@ -151,34 +157,50 @@ function bin ( data ) {
 function draw ( table, alphabet, context )
 {
 	alphabet.empty();
-	alphabet.append( context.oLanguage.alphabetSearch.infoDisplay + ': ' );
+
+	if(context.oLanguage.alphabetSearch.infoDisplay !== ''){
+		$('<span class="alphabet-info-display"></span>')
+			.html(context.oLanguage.alphabetSearch.infoDisplay)
+			.appendTo( alphabet );
+	}
 
 	var columnData = table.column(context.alphabetSearch.column, { search: 'applied' } ).data();
 	var bins = bin( columnData );
 
-	$('<span class="alphabet-clear' + ((!context.alphabetSearch.letter) ? ' active' : '') + '"/>')
+	var alphabetList = $('<ul/>');
+
+	$('<a/>')
+		.attr( 'href', 'javascript:;' )
 		.data( 'letter', '' )
 		.data( 'match-count', columnData.length )
-		.html( context.oLanguage.alphabetSearch.infoAll )
-		.appendTo( alphabet );
+		.addClass(
+			((!context.alphabetSearch.letter) ? 'active' : '')
+		)
+		.html( '<span>' + context.oLanguage.alphabetSearch.infoAll + '</span>' )
+		.wrap( '<li/>' )
+		.parent()
+		.appendTo( alphabetList );
 
 	for ( var i=0 ; i<context.oLanguage.alphabetSearch.alphabet.length ; i++ ) {
 		var letter = context.oLanguage.alphabetSearch.alphabet[i];
 
-		$('<span/>')
+		$('<a/>')
+			.attr( 'href', 'javascript:;' )
 			.data( 'letter', letter )
 			.data( 'match-count', bins[letter] || 0 )
 			.addClass(
 				(! bins[letter] ? 'empty' : '')
 				+ ((context.alphabetSearch.letter === letter) ? ' active' : '')
 			)
-			.html(
-				(letter === '#') ? '0-9' : letter
-			)
-			.appendTo( alphabet );
+			.html( '<span>' + letter + '</span>' )
+			.wrap( '<li/>' )
+			.parent()
+			.appendTo( alphabetList );
 	}
 
-	$('<div class="alphabet_info"></div>')
+	alphabetList.appendTo( alphabet );
+
+	$('<div class="alphabet-info"></div>')
 		.appendTo( alphabet );
 
 
@@ -221,7 +243,7 @@ $.fn.dataTable.AlphabetSearch = function ( context ) {
 		$.extend(
 			{
 				'alphabet': '#ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-				'infoDisplay': 'Display',
+				'infoDisplay': 'Display:',
 				'infoAll': 'All'
 			},
 			((context.oLanguage.alphabetSearch)
@@ -288,7 +310,10 @@ $.fn.dataTable.AlphabetSearch = function ( context ) {
 
 
 	// Trigger a search
-	alphabet.on( 'click', 'span', function () {
+	alphabet.on( 'click', 'a', function (e) {
+		// Prevent default behavior
+		e.preventDefault();
+
 		alphabet.find( '.active' ).removeClass( 'active' );
 		$(this).addClass( 'active' );
 
@@ -299,19 +324,25 @@ $.fn.dataTable.AlphabetSearch = function ( context ) {
 
 	// Mouse events to show helper information
 	alphabet
-		.on( 'mouseenter', 'span', function () {
-			alphabet
-				.find('div.alphabet_info')
+		.on( 'mouseenter', 'a', function () {
+			var $el = $(this);
+			var el_pos = $el.position();
+
+			var $alphabet_info = $('.alphabet-info', alphabet);
+
+			$alphabet_info.html( $el.data('match-count') );
+
+			// Display helper centered horizontally under the letter
+			$alphabet_info
 				.css( {
 					opacity: 1,
-					left: $(this).position().left,
-					width: $(this).width()
-				} )
-				.html( $(this).data('match-count') );
+					left: el_pos.left + Math.round(($el.outerWidth() - $alphabet_info.outerWidth())/2),
+					top: $(this).position().top + $el.outerHeight()
+				} );
 		} )
-		.on( 'mouseleave', 'span', function () {
+		.on( 'mouseleave', 'a', function () {
 			alphabet
-				.find('div.alphabet_info')
+				.find('div.alphabet-info')
 				.css('opacity', 0);
 		} );
 
@@ -325,11 +356,11 @@ $.fn.dataTable.AlphabetSearch = function ( context ) {
 		var group_last = null;
 
 		api.column(context.alphabetSearch.column, { page: 'current' }).data().each(function (name, index){
-			var group = name.charAt(0).toUpperCase();
+			var group = name.replace(/<.*?>/g, '').charAt(0).toUpperCase();
 
 			if (group_last !== group) {
 				$(rows).eq(index).before(
-					'<tr class="alphabet_group"><td colspan="' + col_total + '">' + group + '</td></tr>'
+					'<tr class="alphabet-group"><td colspan="' + col_total + '">' + group + '</td></tr>'
 				);
 
 				group_last = group;
@@ -338,10 +369,10 @@ $.fn.dataTable.AlphabetSearch = function ( context ) {
 
 		// If there are no rows found and letter is selected
 		if(!rows.length && context.alphabetSearch){
-			var letter = (context.alphabetSearch.letter === '#') ? '0-9' : context.alphabetSearch.letter;
+			var letter = context.alphabetSearch.letter;
 
 			$(api.table().body()).prepend(
-				'<tr class="alphabet_group"><td colspan="' + col_total + '">' + letter + '</td></tr>'
+				'<tr class="alphabet-group"><td colspan="' + col_total + '">' + letter + '</td></tr>'
 			);
 		}
 	});

data/app/assets/javascripts/datatables/plugins/sorting/currency.js

@@ -0,0 +1,36 @@
+/**
+ * This plug-in will provide numeric sorting for currency columns (either 
+ * detected automatically with the currency type detection plug-in or set 
+ * manually) while taking account of the currency symbol ($ or £ by default).
+ *
+ * DataTables 1.10+ has currency sorting abilities built-in and will be
+ * automatically detected. As such this plug-in is marked as deprecated, but
+ * might be useful when working with old versions of DataTables.
+ *
+ *  @name Currency
+ *  @summary Sort data numerically when it has a leading currency symbol.
+ *  @deprecated
+ *  @author [Allan Jardine](http://sprymedia.co.uk)
+ *
+ *  @example
+ *    $('#example').dataTable( {
+ *       columnDefs: [
+ *         { type: 'currency', targets: 0 }
+ *       ]
+ *    } );
+ */
+
+jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+  "currency-pre": function ( a ) {
+    a = (a==="-") ? 0 : a.replace( /[^\d\-\.]/g, "" );
+    return parseFloat( a );
+  },
+
+  "currency-asc": function ( a, b ) {
+    return a - b;
+  },
+
+  "currency-desc": function ( a, b ) {
+    return b - a;
+  }
+} );

data/app/assets/javascripts/datatables/plugins/sorting/date-uk.js

@@ -0,0 +1,42 @@
+/**
+ * DataTables internal date sorting replies on `Date.parse()` which is part of 
+ * the Javascript language, but you may wish to sort on dates which is doesn't 
+ * recognise. The following is a plug-in for sorting dates in the format 
+ * `dd/mm/yy`.
+ * 
+ * An automatic type detection plug-in is available for this sorting plug-in.
+ *
+ * Please note that this plug-in is **deprecated*. The
+ * [datetime](//datatables.net/blog/2014-12-18) plug-in provides enhanced
+ * functionality and flexibility.
+ *
+ *  @name Date (dd/mm/YY)
+ *  @summary Sort dates in the format `dd/mm/YY`
+ *  @author Andy McMaster
+ *  @deprecated
+ *
+ *  @example
+ *    $('#example').dataTable( {
+ *       columnDefs: [
+ *         { type: 'date-uk', targets: 0 }
+ *       ]
+ *    } );
+ */
+
+ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+	"date-uk-pre": function ( a ) {
+		if (a == null || a == "") {
+			return 0;
+		}
+		var ukDatea = a.split('/');
+		return (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
+	},
+
+	"date-uk-asc": function ( a, b ) {
+		return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+	},
+
+	"date-uk-desc": function ( a, b ) {
+		return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+	}
+} );

data/app/assets/javascripts/datatables/plugins/sorting/file-size.js

@@ -22,6 +22,7 @@ jQuery.fn.dataTable.ext.type.order['file-size-pre'] = function ( data ) {
     var matches = data.match( /^(\d+(?:\.\d+)?)\s*([a-z]+)/i );
     var multipliers = {
         b:  1,
+        bytes: 1,
         kb: 1000,
         kib: 1024,
         mb: 1000000,
@@ -40,4 +41,4 @@ jQuery.fn.dataTable.ext.type.order['file-size-pre'] = function ( data ) {
     } else {
         return -1;
     };
-};
+};

data/app/assets/javascripts/datatables/plugins/sorting/formatted-numbers.js

@@ -0,0 +1,40 @@
+/**
+ * This plug-in will provide numeric sorting for numeric columns which have
+ * extra formatting, such as thousands separators, currency symbols or any other
+ * non-numeric data.
+ * 
+ * By default when a cell is found to have no numeric data its value is sorted
+ * numerically as if its value were 0. This could also be altered to be Inifnity
+ * or -Infinity as required.
+ *
+ * DataTables 1.10+ has formatted number detection and sorting abilities built-
+ * in. As such this plug-in is marked as deprecated, but might be useful when
+ * working with old versions of DataTables.
+ *
+ *  @name Formatted numbers
+ *  @summary Sort numbers which are displayed with thousand separators
+ *  @deprecated
+ *  @author [Allan Jardine](http://sprymedia.co.uk)
+ *
+ *  @example
+ *    $('#example').dataTable( {
+ *       columnDefs: [
+ *         { type: 'formatted-num', targets: 0 }
+ *       ]
+ *    } );
+ */
+
+jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+	"formatted-num-pre": function ( a ) {
+		a = (a === "-" || a === "") ? 0 : a.replace( /[^\d\-\.]/g, "" );
+		return parseFloat( a );
+	},
+
+	"formatted-num-asc": function ( a, b ) {
+		return a - b;
+	},
+
+	"formatted-num-desc": function ( a, b ) {
+		return b - a;
+	}
+} );

data/app/assets/javascripts/datatables/plugins/sorting/ip-address.js

@@ -17,87 +17,88 @@
  */
 
 jQuery.extend( jQuery.fn.dataTableExt.oSort, {
-	"ip-address-pre": function ( a ) {
-		var i, item;
-		var m = a.split("."),
-			n = a.split(":"),
-			x = "",
-			xa = "";
+  "ip-address-pre": function ( a ) {
+    if (!a) { return 0 }
+    var i, item;
+    var m = a.split("."),
+      n = a.split(":"),
+      x = "",
+      xa = "";
 
-		if (m.length == 4) {
-			// IPV4
-			for(i = 0; i < m.length; i++) {
-				item = m[i];
+    if (m.length == 4) {
+      // IPV4
+      for(i = 0; i < m.length; i++) {
+        item = m[i];
 
-				if(item.length == 1) {
-					x += "00" + item;
-				}
-				else if(item.length == 2) {
-					x += "0" + item;
-				}
-				else {
-					x += item;
-				}
-			}
-		}
-		else if (n.length > 0) {
-			// IPV6
-			var count = 0;
-			for(i = 0; i < n.length; i++) {
-				item = n[i];
+        if(item.length == 1) {
+          x += "00" + item;
+        }
+        else if(item.length == 2) {
+          x += "0" + item;
+        }
+        else {
+          x += item;
+        }
+      }
+    }
+    else if (n.length > 0) {
+      // IPV6
+      var count = 0;
+      for(i = 0; i < n.length; i++) {
+        item = n[i];
 
-				if (i > 0) {
-					xa += ":";
-				}
+        if (i > 0) {
+          xa += ":";
+        }
 
-				if(item.length === 0) {
-					count += 0;
-				}
-				else if(item.length == 1) {
-					xa += "000" + item;
-					count += 4;
-				}
-				else if(item.length == 2) {
-					xa += "00" + item;
-					count += 4;
-				}
-				else if(item.length == 3) {
-					xa += "0" + item;
-					count += 4;
-				}
-				else {
-					xa += item;
-					count += 4;
-				}
-			}
+        if(item.length === 0) {
+          count += 0;
+        }
+        else if(item.length == 1) {
+          xa += "000" + item;
+          count += 4;
+        }
+        else if(item.length == 2) {
+          xa += "00" + item;
+          count += 4;
+        }
+        else if(item.length == 3) {
+          xa += "0" + item;
+          count += 4;
+        }
+        else {
+          xa += item;
+          count += 4;
+        }
+      }
 
-			// Padding the ::
-			n = xa.split(":");
-			var paddDone = 0;
+      // Padding the ::
+      n = xa.split(":");
+      var paddDone = 0;
 
-			for (i = 0; i < n.length; i++) {
-				item = n[i];
+      for (i = 0; i < n.length; i++) {
+        item = n[i];
 
-				if (item.length === 0 && paddDone === 0) {
-					for (var padding = 0 ; padding < (32-count) ; padding++) {
-						x += "0";
-						paddDone = 1;
-					}
-				}
-				else {
-					x += item;
-				}
-			}
-		}
+        if (item.length === 0 && paddDone === 0) {
+          for (var padding = 0 ; padding < (32-count) ; padding++) {
+            x += "0";
+            paddDone = 1;
+          }
+        }
+        else {
+          x += item;
+        }
+      }
+    }
 
-		return x;
-	},
+    return x;
+  },
 
-	"ip-address-asc": function ( a, b ) {
-		return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-	},
+  "ip-address-asc": function ( a, b ) {
+    return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+  },
 
-	"ip-address-desc": function ( a, b ) {
-		return ((a < b) ? 1 : ((a > b) ? -1 : 0));
-	}
+  "ip-address-desc": function ( a, b ) {
+    return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+  }
 });