jquery-datatables 1.10.16 → 1.10.17

data/app/assets/stylesheets/datatables/dataTables.foundation.scss

@@ -111,19 +111,19 @@ table.dataTable thead {
 	}
 
 	.sorting {
-		background-image: image-url("datatables/sort_both.png");
+		background-image: url('../images/sort_both.png');
 	}
 	.sorting_asc {
-		background-image: image-url("datatables/sort_asc.png");
+		background-image: url('../images/sort_asc.png');
 	}
 	.sorting_desc {
-		background-image: image-url("datatables/sort_desc.png");
+		background-image: url('../images/sort_desc.png');
 	}
 	.sorting_asc_disabled {
-		background-image: image-url("datatables/sort_asc_disabled.png");
+		background-image: url('../images/sort_asc_disabled.png');
 	}
 	.sorting_desc_disabled {
-		background-image: image-url("datatables/sort_desc_disabled.png");
+		background-image: url('../images/sort_desc_disabled.png');
 	}
 }
 

data/app/assets/stylesheets/datatables/dataTables.material.scss

@@ -98,4 +98,4 @@ table.dataTable thead {
 	.sorting_desc_disabled:after {
 		opacity: 0;
 	}
-}
+}

data/app/assets/stylesheets/datatables/dataTables.uikit.scss

@@ -1,9 +1,6 @@
 
 table.dataTable {
 	clear: both;
-	margin-top: 6px !important;
-	margin-bottom: 6px !important;
-	max-width: none !important;
 
 	td,
 	th {
@@ -90,42 +87,56 @@ div.dataTables_wrapper {
 }
 
 
-// Sorting icons using UIKit's built in icons (Font Awesome)
+// Sorting - using :before and :after with UTF8 characters
 table.dataTable thead {
 	> tr > th,
 	> tr > td {
-		position: relative;
-
 		&.sorting_asc,
 		&.sorting_desc,
 		&.sorting {
 			padding-right: 30px;
 		}
 
-		&.sorting:after,
-		&.sorting_asc:after,
-		&.sorting_desc:after {
+		&:active {
+			outline: none;
+		}
+	}
+
+	.sorting,
+	.sorting_asc,
+	.sorting_desc,
+	.sorting_asc_disabled,
+	.sorting_desc_disabled {
+		cursor: pointer;
+		position: relative;
+
+		&:before,
+		&:after {
 			position: absolute;
-			top: 7px;
-			right: 8px;
+			bottom: 1.2em;
 			display: block;
-			font-family: 'FontAwesome';
+			opacity: 0.3;
 		}
 
-		&.sorting:after {
-			content: "\f0dc";
-			color: #ddd;
-			font-size: 0.8em;
-			padding-top: 0.12em;
+		&:before {
+			right: 1em;
+			content: "\2191"; // up arrow - ascending
 		}
 
-		&.sorting_asc:after {
-			content: "\f0de";
+		&:after {
+			right: 0.5em;
+			content: "\2193"; // down arrow - descending
 		}
+	}
 
-		&.sorting_desc:after {
-			content: "\f0dd";
-		}
+	.sorting_asc:before,
+	.sorting_desc:after {
+		opacity: 1;
+	}
+
+	.sorting_asc_disabled:before,
+	.sorting_desc_disabled:after {
+		opacity: 0;
 	}
 }
 

data/app/assets/stylesheets/datatables/extensions/AutoFill/autoFill.bootstrap.scss

@@ -6,3 +6,12 @@ $autofill-handle-background: #337ab7;
 
 @import 'autoFill.dataTables.scss';
 
+div.dt-autofill-list {
+	div.dt-autofill-question {
+		input[type=number] {
+			padding: 6px;
+			width: 60px;
+			margin: -2px 0;
+		}
+    }
+}

data/app/assets/stylesheets/datatables/extensions/AutoFill/autoFill.bootstrap4.scss

@@ -6,3 +6,12 @@ $autofill-handle-background: #0275d8;
 
 @import 'autoFill.dataTables.scss';
 
+div.dt-autofill-list {
+	div.dt-autofill-question {
+		input[type=number] {
+			padding: 6px;
+			width: 60px;
+			margin: -2px 0;
+		}
+    }
+}

data/app/assets/stylesheets/datatables/extensions/Buttons/buttons.dataTables.scss

@@ -9,11 +9,13 @@ a.dt-button {
 	display: inline-block;
 	box-sizing: border-box;
 	margin-right: 0.333em;
+	margin-bottom: 0.333em;
 	padding: 0.5em 1em;
 	border: 1px solid #999;
 	border-radius: 2px;
 	cursor: pointer;
 	font-size: 0.88em;
+	line-height: 1.6em;
 	color: black;
 	//box-shadow: 1px 1px 3px #ccc;
 	white-space: nowrap;
@@ -91,14 +93,13 @@ div.dt-button-collection {
 	border-radius: 5px;
 	box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
 
-	z-index: 2002;
-
 	button.dt-button,
 	div.dt-button,
 	a.dt-button {
 		position: relative;
 		left: 0;
 		right: 0;
+		width: 100%;
 
 		display: block;
 		float: none;

data/app/assets/stylesheets/datatables/extensions/Buttons/buttons.jqueryui.scss

@@ -48,14 +48,12 @@ div.dt-button-collection {
 		position: relative;
 		left: 0;
 		right: 0;
+		width: 100%;
 
 		display: block;
 		float: none;
 		margin-right: 0;
-
-		&:last-child {
-			margin-bottom: 4px;
-		}
+		margin-bottom: 4px;
 
 		&:hover > span {
 			background-color: rgba(0, 0, 0, 0.05);

data/app/assets/stylesheets/datatables/extensions/Buttons/mixins.scss

@@ -86,6 +86,11 @@
 		     -o-column-count: 4;
 		column-count: 4;
 	}
+
+	// Chrome fix - 531528
+	.dt-button {
+		border-radius: 0;
+	}
 }
 
 

data/app/assets/stylesheets/datatables/extensions/FixedColumns/fixedColumns.bootstrap4.scss

@@ -1,11 +1,8 @@
 
 @import 'fixedColumns.bootstrap.scss';
 
-// Bootstrap 4 uses rgba for the table background colours, so we need to
-// block them out
-table.dataTable.table-striped.DTFC_Cloned tbody tr:nth-of-type(odd) {
-    background-color: #F3F3F3;
-}
-table.dataTable.table-striped.DTFC_Cloned tbody tr:nth-of-type(even) {
+// Bootstrap 4 uses rgba for the table row background colours, and as FixedColumns
+// layers the elements on top of each other, we need to block out the fixed area.
+table.dataTable.table-striped.DTFC_Cloned tbody {
     background-color: white;
 }

data/app/assets/stylesheets/datatables/extensions/KeyTable/keyTable.bootstrap.scss

@@ -1,4 +1,4 @@
 
-$keytable-focus: 3px solid #337ab7 !default;
+$keytable-focus: #337ab7 !default;
 
 @import 'keyTable.dataTables.scss';

data/app/assets/stylesheets/datatables/extensions/KeyTable/keyTable.bootstrap4.scss

@@ -1,4 +1,4 @@
 
-$keytable-focus: 3px solid #0275d8 !default;
+$keytable-focus: #0275d8 !default;
 
 @import 'keyTable.dataTables.scss';

data/app/assets/stylesheets/datatables/extensions/KeyTable/keyTable.dataTables.scss

@@ -1,10 +1,11 @@
 
-$keytable-focus: 3px solid #3366FF !default;
+$keytable-focus: #3366FF !default;
 
 table.dataTable {
-	th.focus,
-	td.focus {
-		outline: $keytable-focus;
-		outline-offset: -1px;
+	tbody {
+		th.focus,
+		td.focus {
+			box-shadow: inset 0 0 1px 2px $keytable-focus;
+		}
 	}
 }

data/app/assets/stylesheets/datatables/extensions/KeyTable/keyTable.foundation.scss

@@ -1,4 +1,4 @@
 
-$keytable-focus: 3px solid #008CBA !default;
+$keytable-focus: #008CBA !default;
 
 @import 'keyTable.dataTables.scss';

data/app/assets/stylesheets/datatables/extensions/KeyTable/keyTable.semanticui.scss

@@ -1,4 +1,4 @@
 
-$keytable-focus: 3px solid #888 !default;
+$keytable-focus: #888 !default;
 
 @import 'keyTable.dataTables.scss';

data/app/assets/stylesheets/datatables/extensions/Scroller/scroller.bootstrap.scss

@@ -3,7 +3,7 @@
 
 div.DTS {
 	// Don't have transparent rows
-	tbody tr.even {
+	tbody tr {
 		background-color: white;
 	}
 }

data/app/assets/stylesheets/datatables/extensions/Scroller/scroller.bootstrap4.scss

@@ -1,9 +1,7 @@
 
 @import 'scroller.dataTables.scss';
 
-div.DTS {
+div.DTS div.dataTables_scrollBody table {
 	// Don't have transparent rows
-	tbody tr.even {
-		background-color: white;
-	}
+	background-color: white;
 }

data/app/assets/stylesheets/datatables/jquery.dataTables.scss

@@ -114,19 +114,19 @@ table.dataTable {
 			}
 
 			.sorting {
-				background-image: image-url("datatables/sort_both.png");
+				background-image: url('../images/sort_both.png');
 			}
 			.sorting_asc {
-				background-image: image-url("datatables/sort_asc.png");
+				background-image: url('../images/sort_asc.png');
 			}
 			.sorting_desc {
-				background-image: image-url("datatables/sort_desc.png");
+				background-image: url('../images/sort_desc.png');
 			}
 			.sorting_asc_disabled {
-				background-image: image-url("datatables/sort_asc_disabled.png");
+				background-image: url('../images/sort_asc_disabled.png');
 			}
 			.sorting_desc_disabled {
-				background-image: image-url("datatables/sort_desc_disabled.png");
+				background-image: url('../images/sort_desc_disabled.png');
 			}
 		}
 	}

data/jquery-datatables.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_development_dependency 'actionpack', '~> 4.1'
-  spec.add_development_dependency 'activesupport', '~> 4.1'
+
+  spec.add_runtime_dependency 'sass', '>= 3.5.2'
+  spec.add_runtime_dependency 'autoprefixer-rails', '>= 6.0.3'
+  
   spec.add_development_dependency 'sprockets-rails', '~> 2.3'
   spec.add_development_dependency 'jquery-rails', '~> 3.1'
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/generators/jquery/datatables/install_generator.rb

@@ -9,6 +9,7 @@ module Jquery
         argument :style, :type => :string, :default => 'regular'
         # needed for thor templates
         source_root File.expand_path("../templates", __FILE__)
+        class_option :template_engine, desc: 'Template engine to be invoked (erb, haml or slim).'
         
         def add_assets
           js_manifest = 'app/assets/javascripts/application.js'
@@ -16,17 +17,24 @@ module Jquery
           scss_manifest = 'app/assets/stylesheets/application.scss'
           js_strings = "//= require datatables\n"
 
-          insert_into_file js_manifest, js_strings, :after => "jquery_ujs\n" if File.exists?(js_manifest)
+          insert_into_file js_manifest, js_strings, :after => "turbolinks\n" if File.exists?(js_manifest)
           insert_css_strings(css_manifest) if File.exists?(css_manifest)
           insert_scss_strings(scss_manifest) if File.exists?(scss_manifest)
-          copy_core_file
+          copy_assets_file
+          append_global_initializer
+        end
+
+        def copy_scaffold_template
+          engine = options[:template_engine]
+          copy_file "views/index.html.#{engine}", "lib/templates/#{engine}/scaffold/index.html.#{engine}"
+          copy_file "views/index.json.jbuilder", "lib/templates//rails/jbuilder/index.json.jbuilder"
         end
 
         private
         
         def insert_css_strings(css_manifest)
           content = File.read(css_manifest)
-          css_strings = "*/= require datatables\n"
+          css_strings = "*= require datatables\n"
 
           if requires_tree(content)
             insert_into_file css_manifest, css_strings, :after => "require_tree .\n"
@@ -44,6 +52,13 @@ module Jquery
           append_to_file scss_manifest, scss_strings
         end
 
+        def append_global_initializer
+          init = File.expand_path(find_in_source_paths("javascripts/initializer.js.tt"))
+          content = File.read(init)
+          js_datatables = "app/assets/javascripts/datatables.js"
+          append_to_file js_datatables, content
+        end
+
         def requires_tree(content)
           content.match(/require_tree\s+\.\s*$/)
         end
@@ -52,11 +67,12 @@ module Jquery
           content.match(/require_self\s*$/)
         end
         
-        def copy_core_file
-          template "#{style}.js.tt", "app/assets/javascripts/datatables.js"
-          template "#{style}.scss.tt", "app/assets/stylesheets/datatables.scss"
+        def copy_assets_file
+          template "javascripts/#{style}.js.tt", "app/assets/javascripts/datatables.js"
+          template "stylesheets/#{style}.scss.tt", "app/assets/stylesheets/datatables.scss"
         end
 
+        
       end
     end
   end

data/lib/generators/jquery/datatables/templates/javascripts/initializer.js.tt

@@ -0,0 +1,30 @@
+
+
+//Global setting and initializer
+
+$.extend( $.fn.dataTable.defaults, {
+  responsive: true,
+  pagingType: 'full',
+  //dom:
+  //  "<'row'<'col-sm-4 text-left'f><'right-action col-sm-8 text-right'<'buttons'B> <'select-info'> >>" +
+  //  "<'row'<'dttb col-12 px-0'tr>>" +
+  //  "<'row'<'col-sm-12 table-footer'lip>>"
+});
+
+
+$(document).on('preInit.dt', function(e, settings) {
+  var api, table_id, url;
+  api = new $.fn.dataTable.Api(settings);
+  table_id = "#" + api.table().node().id;
+  url = $(table_id).data('source');
+  if (url) {
+    return api.ajax.url(url);
+  }
+});
+
+
+$(document).on('turbolinks:load', function() {
+  if (!$.fn.DataTable.isDataTable("table[id^=dttb-]")) {
+    $("table[id^=dttb-]").DataTable();
+  }
+});