jquery-datatables-rails 3.2.0 → 3.3.0

data/app/assets/javascripts/dataTables/jquery.dataTables.sorting.numbersHtml.js

@@ -1,15 +1,38 @@
-jQuery.fn.dataTableExt.oSort['num-html-asc']  = function(a,b) {
-    var x = a.replace( /<.*?>/g, "" );
-    var y = b.replace( /<.*?>/g, "" );
-    x = parseFloat( x );
-    y = parseFloat( y );
-    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
-};
+/**
+ * This sorting plug-in allows for HTML tags with numeric data. With the 'html'
+ * type it will strip the HTML and then sorts by strings, with this type it 
+ * strips the HTML and then sorts by numbers. Note also that this sorting 
+ * plug-in has an equivalent type detection plug-in which can make integration
+ * easier.
+ * 
+ * DataTables 1.10+ has HTML numeric data type 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 Numbers with HTML
+ *  @summary Sort data which is a mix of HTML and numeric data.
+ *  @deprecated
+ *  @author [Allan Jardine](http://sprymedia.co.uk)
+ *
+ *  @example
+ *    $('#example').dataTable( {
+ *       columnDefs: [
+ *         { type: 'num-html', targets: 0 }
+ *       ]
+ *    } );
+ */
 
-jQuery.fn.dataTableExt.oSort['num-html-desc'] = function(a,b) {
-    var x = a.replace( /<.*?>/g, "" );
-    var y = b.replace( /<.*?>/g, "" );
-    x = parseFloat( x );
-    y = parseFloat( y );
-    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
-};
+jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+	"num-html-pre": function ( a ) {
+		var x = String(a).replace( /<[\s\S]*?>/g, "" );
+		return parseFloat( x );
+	},
+
+	"num-html-asc": function ( a, b ) {
+		return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+	},
+
+	"num-html-desc": function ( a, b ) {
+		return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+	}
+} );

data/app/assets/javascripts/dataTables/jquery.dataTables.typeDetection.numbersHtml.js

@@ -1,40 +1,56 @@
+/**
+ * This type-detection plug-in will look at an HTML string from a data cell,
+ * strip the HTML tags and then check to see if the remaining data is numeric.
+ * If it is, then the data can be sorted numerically with the Numbers with HTML
+ * sorting plug-in.
+ *
+ * DataTables 1.10+ has numeric HTML data type 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 Numbers with HTML
+ *  @summary Detect data which is a mix of HTML and numeric data.
+ *  @deprecated
+ *  @author [Allan Jardine](http://sprymedia.co.uk)
+ */
+
 jQuery.fn.dataTableExt.aTypes.unshift( function ( sData )
 {
-    sData = typeof sData.replace == 'function' ?
-        sData.replace( /<.*?>/g, "" ) : sData;
-    sData = $.trim(sData);
+	sData = typeof sData.replace == 'function' ?
+		sData.replace( /<[\s\S]*?>/g, "" ) : sData;
+	sData = $.trim(sData);
 
-    var sValidFirstChars = "0123456789-";
-    var sValidChars = "0123456789.";
-    var Char;
-    var bDecimal = false;
+	var sValidFirstChars = "0123456789-";
+	var sValidChars = "0123456789.";
+	var Char;
+	var bDecimal = false;
 
-    /* Check for a valid first char (no period and allow negatives) */
-    Char = sData.charAt(0);
-    if (sValidFirstChars.indexOf(Char) == -1)
-    {
-        return null;
-    }
+	/* Check for a valid first char (no period and allow negatives) */
+	Char = sData.charAt(0);
+	if (sValidFirstChars.indexOf(Char) == -1)
+	{
+		return null;
+	}
 
-    /* Check all the other characters are valid */
-    for ( var i=1 ; i<sData.length ; i++ )
-    {
-        Char = sData.charAt(i);
-        if (sValidChars.indexOf(Char) == -1)
-        {
-            return null;
-        }
+	/* Check all the other characters are valid */
+	for ( var i=1 ; i<sData.length ; i++ )
+	{
+		Char = sData.charAt(i);
+		if (sValidChars.indexOf(Char) == -1)
+		{
+			return null;
+		}
 
-        /* Only allowed one decimal place... */
-        if ( Char == "." )
-        {
-            if ( bDecimal )
-            {
-                return null;
-            }
-            bDecimal = true;
-        }
-    }
+		/* Only allowed one decimal place... */
+		if ( Char == "." )
+		{
+			if ( bDecimal )
+			{
+				return null;
+			}
+			bDecimal = true;
+		}
+	}
 
-    return 'num-html';
-} );
+	return 'num-html';
+} );

data/app/assets/stylesheets/dataTables/bootstrap/2/jquery.dataTables.bootstrap.scss

@@ -5,7 +5,6 @@
 //= depend_on_asset "dataTables/sort_desc_disabled.png"
 
 div.dataTables_length label {
-	float: left;
 	text-align: left;
 }
 
@@ -13,8 +12,17 @@ div.dataTables_length select {
 	width: 75px;
 }
 
+div.dataTables_filter {
+	text-align: right;
+}
+
 div.dataTables_filter label {
-	float: right;
+	text-align: left;
+}
+
+div.dataTables_filter input {
+	margin-left: 0.5em;
+	display: inline-block;
 }
 
 div.dataTables_info {
@@ -22,10 +30,23 @@ div.dataTables_info {
 }
 
 div.dataTables_paginate {
-	float: right;
+	text-align: right;
+	margin: 0;
+}
+
+div.dataTables_paginate div.pagination {
 	margin: 0;
 }
 
+@media screen and (max-width: 767px) {
+	div.dataTables_length,
+	div.dataTables_filter,
+	div.dataTables_info,
+	div.dataTables_paginate {
+		text-align: center;
+	}
+}
+
 table.table {
 	clear: both;
 	margin-bottom: 6px !important;
@@ -67,6 +88,7 @@ div.dataTables_scrollHead table thead tr:last-child td:first-child {
 
 div.dataTables_scrollBody table {
 	border-top: none;
+	margin-top: 0 !important;
 	margin-bottom: 0 !important;
 }
 
@@ -76,6 +98,7 @@ div.dataTables_scrollBody tbody tr:first-child td {
 }
 
 div.dataTables_scrollFoot table {
+	margin-top: 0 !important;
 	border-top: none;
 }
 
@@ -137,7 +160,7 @@ ul.DTTT_dropdown.dropdown-menu li:hover a {
 }
 
 div.DTTT_collection_background {
-	z-index: 2002;
+	z-index: 2002;	
 }
 
 /* TableTools information display */
@@ -170,8 +193,9 @@ div.DTFC_RightHeadWrapper table,
 div.DTFC_RightFootWrapper table,
 table.DTFC_Cloned tr.even {
     background-color: white;
+    margin-bottom: 0;
 }
-
+ 
 div.DTFC_RightHeadWrapper table ,
 div.DTFC_LeftHeadWrapper table {
     margin-bottom: 0 !important;
@@ -179,7 +203,7 @@ div.DTFC_LeftHeadWrapper table {
     border-bottom-left-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
 }
-
+ 
 div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
 div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
 div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
@@ -187,21 +211,22 @@ div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
     border-bottom-left-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
 }
-
+ 
 div.DTFC_RightBodyWrapper table,
 div.DTFC_LeftBodyWrapper table {
     border-top: none;
     margin-bottom: 0 !important;
 }
-
+ 
 div.DTFC_RightBodyWrapper tbody tr:first-child th,
 div.DTFC_RightBodyWrapper tbody tr:first-child td,
 div.DTFC_LeftBodyWrapper tbody tr:first-child th,
 div.DTFC_LeftBodyWrapper tbody tr:first-child td {
     border-top: none;
 }
-
+ 
 div.DTFC_RightFootWrapper table,
 div.DTFC_LeftFootWrapper table {
     border-top: none;
 }
+

data/app/assets/stylesheets/dataTables/bootstrap/3/jquery.dataTables.bootstrap.scss

@@ -1,29 +1,39 @@
 div.dataTables_length label {
 	font-weight: normal;
-	float: left;
 	text-align: left;
+	white-space: nowrap;
 }
 
 div.dataTables_length select {
 	width: 75px;
+	display: inline-block;
+}
+
+div.dataTables_filter {
+	text-align: right;
 }
 
 div.dataTables_filter label {
 	font-weight: normal;
-	float: right;
+	white-space: nowrap;
+	text-align: left;
 }
 
 div.dataTables_filter input {
-	width: 16em;
+	margin-left: 0.5em;
+	display: inline-block;
+	width: auto;
 }
 
 div.dataTables_info {
 	padding-top: 8px;
+	white-space: nowrap;
 }
 
 div.dataTables_paginate {
-	float: right;
 	margin: 0;
+	white-space: nowrap;
+	text-align: right;
 }
 
 div.dataTables_paginate ul.pagination {
@@ -31,6 +41,21 @@ div.dataTables_paginate ul.pagination {
 	white-space: nowrap;
 }
 
+@media screen and (max-width: 767px) {
+	div.dataTables_wrapper > div.row > div,
+	div.dataTables_length,
+	div.dataTables_filter,
+	div.dataTables_info,
+	div.dataTables_paginate {
+		text-align: center;
+	}
+
+	div.DTTT {
+		margin-bottom: 0.5em;
+	}
+}
+
+
 table.dataTable td,
 table.dataTable th {
 	-webkit-box-sizing: content-box;
@@ -52,24 +77,61 @@ table.dataTable thead .sorting_desc,
 table.dataTable thead .sorting_asc_disabled,
 table.dataTable thead .sorting_desc_disabled {
 	cursor: pointer;
+	position: relative;
 }
 
-table.dataTable thead .sorting { background: image-url('dataTables/sort_both.png') no-repeat center right; }
-table.dataTable thead .sorting_asc { background: image-url('dataTables/sort_asc.png') no-repeat center right; }
-table.dataTable thead .sorting_desc { background: image-url('dataTables/sort_desc.png') no-repeat center right; }
+table.dataTable thead .sorting:after,
+table.dataTable thead .sorting_asc:after,
+table.dataTable thead .sorting_desc:after {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: block;
+	font-family: 'Glyphicons Halflings';
+	opacity: 0.5;
+}
+table.dataTable thead .sorting:after {
+	opacity: 0.2;
+	content: "\e150"; /* sort */
+}
+table.dataTable thead .sorting_asc:after {
+	content: "\e155"; /* sort-by-attributes */
+}
+table.dataTable thead .sorting_desc:after {
+	content: "\e156"; /* sort-by-attributes-alt */
+}
+div.dataTables_scrollBody table.dataTable thead .sorting:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_asc:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_desc:after {
+	display: none;
+}
 
-table.dataTable thead .sorting_asc_disabled { background: image-url('dataTables/sort_asc_disabled.png') no-repeat center right; }
-table.dataTable thead .sorting_desc_disabled { background: image-url('dataTables/sort_desc_disabled.png') no-repeat center right; }
+table.dataTable thead .sorting_asc_disabled:after,
+table.dataTable thead .sorting_desc_disabled:after {
+	color: #eee;
+}
 
 table.dataTable thead > tr > th {
-	padding-left: 18px;
-	padding-right: 18px;
+	padding-right: 30px;
 }
 
 table.dataTable th:active {
 	outline: none;
 }
 
+
+/* Condensed */
+table.dataTable.table-condensed thead > tr > th {
+	padding-right: 20px;
+}
+
+table.dataTable.table-condensed thead .sorting:after,
+table.dataTable.table-condensed thead .sorting_asc:after,
+table.dataTable.table-condensed thead .sorting_desc:after {
+	top: 6px;
+	right: 6px;
+}
+
 /* Scrolling */
 div.dataTables_scrollHead table {
 	margin-bottom: 0 !important;
@@ -116,6 +178,11 @@ table.table-bordered tbody td {
 	border-left-width: 0;
 	border-bottom-width: 0;
 }
+table.table-bordered tfoot th,
+table.table-bordered tfoot td {
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
 table.table-bordered th:last-child,
 table.table-bordered td:last-child {
 	border-right-width: 0;
@@ -130,23 +197,24 @@ div.dataTables_scrollHead table.table-bordered {
 /*
  * TableTools styles
  */
-.table tbody tr.active td,
-.table tbody tr.active th {
+.table.dataTable tbody tr.active td,
+.table.dataTable tbody tr.active th {
 	background-color: #08C;
 	color: white;
 }
 
-.table tbody tr.active:hover td,
-.table tbody tr.active:hover th {
+.table.dataTable tbody tr.active:hover td,
+.table.dataTable tbody tr.active:hover th {
 	background-color: #0075b0 !important;
 }
 
-.table tbody tr.active a {
+.table.dataTable tbody tr.active th > a,
+.table.dataTable tbody tr.active td > a {
 	color: white;
 }
 
-.table-striped tbody tr.active:nth-child(odd) td,
-.table-striped tbody tr.active:nth-child(odd) th {
+.table-striped.dataTable tbody tr.active:nth-child(odd) td,
+.table-striped.dataTable tbody tr.active:nth-child(odd) th {
 	background-color: #017ebc;
 }
 
@@ -154,11 +222,6 @@ table.DTTT_selectable tbody tr {
 	cursor: pointer;
 }
 
-div.DTTT .btn {
-	color: #333 !important;
-	font-size: 12px;
-}
-
 div.DTTT .btn:hover {
 	text-decoration: none !important;
 }
@@ -181,14 +244,29 @@ ul.DTTT_dropdown.dropdown-menu li:hover a {
 }
 
 div.DTTT_collection_background {
-	z-index: 2002;
+	z-index: 2002;	
 }
 
 /* TableTools information display */
-div.DTTT_print_info.modal {
+div.DTTT_print_info {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 400px;
 	height: 150px;
+	margin-left: -200px;
 	margin-top: -75px;
 	text-align: center;
+	color: #333;
+	padding: 10px 30px;
+	opacity: 0.95;
+
+	background-color: white;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	border-radius: 6px;
+	
+	-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
 }
 
 div.DTTT_print_info h6 {
@@ -208,10 +286,11 @@ div.dataTables_processing {
     top: 50%;
     left: 50%;
     width: 100%;
-    height: 40px;
+    height: 60px;
     margin-left: -50%;
     margin-top: -25px;
     padding-top: 20px;
+    padding-bottom: 20px;
     text-align: center;
     font-size: 1.2em;
     background-color: white;
@@ -236,15 +315,16 @@ table.DTFC_Cloned tr.even {
     background-color: white;
     margin-bottom: 0;
 }
-
+ 
 div.DTFC_RightHeadWrapper table ,
 div.DTFC_LeftHeadWrapper table {
+	border-bottom: none !important;
     margin-bottom: 0 !important;
     border-top-right-radius: 0 !important;
     border-bottom-left-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
 }
-
+ 
 div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
 div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
 div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
@@ -252,23 +332,34 @@ div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
     border-bottom-left-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
 }
-
+ 
 div.DTFC_RightBodyWrapper table,
 div.DTFC_LeftBodyWrapper table {
     border-top: none;
     margin: 0 !important;
 }
-
+ 
 div.DTFC_RightBodyWrapper tbody tr:first-child th,
 div.DTFC_RightBodyWrapper tbody tr:first-child td,
 div.DTFC_LeftBodyWrapper tbody tr:first-child th,
 div.DTFC_LeftBodyWrapper tbody tr:first-child td {
     border-top: none;
 }
-
+ 
 div.DTFC_RightFootWrapper table,
 div.DTFC_LeftFootWrapper table {
     border-top: none;
+    margin-top: 0 !important;
+}
+
+
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_desc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_desc:after {
+	display: none;
 }