effective_datatables 3.2.7 → 3.3.0

data/app/assets/javascripts/dataTables/responsive/responsive.bootstrap.js

@@ -3,34 +3,34 @@
  */
 
 (function( factory ){
-  if ( typeof define === 'function' && define.amd ) {
-    // AMD
-    define( ['jquery', 'datatables.net-bs', 'datatables.net-responsive'], function ( $ ) {
-      return factory( $, window, document );
-    } );
-  }
-  else if ( typeof exports === 'object' ) {
-    // CommonJS
-    module.exports = function (root, $) {
-      if ( ! root ) {
-        root = window;
-      }
+	if ( typeof define === 'function' && define.amd ) {
+		// AMD
+		define( ['jquery', 'datatables.net-bs', 'datatables.net-responsive'], function ( $ ) {
+			return factory( $, window, document );
+		} );
+	}
+	else if ( typeof exports === 'object' ) {
+		// CommonJS
+		module.exports = function (root, $) {
+			if ( ! root ) {
+				root = window;
+			}
 
-      if ( ! $ || ! $.fn.dataTable ) {
-        $ = require('datatables.net-bs')(root, $).$;
-      }
+			if ( ! $ || ! $.fn.dataTable ) {
+				$ = require('datatables.net-bs')(root, $).$;
+			}
 
-      if ( ! $.fn.dataTable.Responsive ) {
-        require('datatables.net-responsive')(root, $);
-      }
+			if ( ! $.fn.dataTable.Responsive ) {
+				require('datatables.net-responsive')(root, $);
+			}
 
-      return factory( $, root, root.document );
-    };
-  }
-  else {
-    // Browser
-    factory( jQuery, window, document );
-  }
+			return factory( $, root, root.document );
+		};
+	}
+	else {
+		// Browser
+		factory( jQuery, window, document );
+	}
 }(function( $, window, document, undefined ) {
 'use strict';
 var DataTable = $.fn.dataTable;
@@ -39,41 +39,45 @@ var DataTable = $.fn.dataTable;
 var _display = DataTable.Responsive.display;
 var _original = _display.modal;
 var _modal = $(
-  '<div class="modal fade dtr-bs-modal" role="dialog">'+
-    '<div class="modal-dialog" role="document">'+
-      '<div class="modal-content">'+
-        '<div class="modal-header">'+
-          '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+
-        '</div>'+
-        '<div class="modal-body"/>'+
-      '</div>'+
-    '</div>'+
-  '</div>'
+	'<div class="modal fade dtr-bs-modal" role="dialog">'+
+		'<div class="modal-dialog" role="document">'+
+			'<div class="modal-content">'+
+				'<div class="modal-header">'+
+					'<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+
+				'</div>'+
+				'<div class="modal-body"/>'+
+			'</div>'+
+		'</div>'+
+	'</div>'
 );
 
 _display.modal = function ( options ) {
-  return function ( row, update, render ) {
-    if ( ! $.fn.modal ) {
-      _original( row, update, render );
-    }
-    else {
-      if ( ! update ) {
-        if ( options && options.header ) {
-          _modal.find('div.modal-header')
-            .empty()
-            .append( '<h4 class="modal-title">'+options.header( row )+'</h4>' );
-        }
+	return function ( row, update, render ) {
+		if ( ! $.fn.modal ) {
+			_original( row, update, render );
+		}
+		else {
+			if ( ! update ) {
+				if ( options && options.header ) {
+					var header = _modal.find('div.modal-header');
+					var button = header.find('button').detach();
+					
+					header
+						.empty()
+						.append( '<h4 class="modal-title">'+options.header( row )+'</h4>' )
+						.prepend( button );
+				}
 
-        _modal.find( 'div.modal-body' )
-          .empty()
-          .append( render() );
+				_modal.find( 'div.modal-body' )
+					.empty()
+					.append( render() );
 
-        _modal
-          .appendTo( 'body' )
-          .modal();
-      }
-    }
-  };
+				_modal
+					.appendTo( 'body' )
+					.modal();
+			}
+		}
+	};
 };
 
 

data/app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.css

@@ -1,3 +1,32 @@
+@keyframes dtb-spinner {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+@-o-keyframes dtb-spinner {
+  100% {
+    -o-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-ms-keyframes dtb-spinner {
+  100% {
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-webkit-keyframes dtb-spinner {
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-moz-keyframes dtb-spinner {
+  100% {
+    -moz-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
 div.dt-button-info {
   position: fixed;
   top: 50%;
@@ -100,3 +129,30 @@ div.dt-button-background {
     float: none;
   }
 }
+div.dt-buttons button.btn.processing,
+div.dt-buttons div.btn.processing,
+div.dt-buttons a.btn.processing {
+  color: rgba(0, 0, 0, 0.2);
+}
+div.dt-buttons button.btn.processing:after,
+div.dt-buttons div.btn.processing:after,
+div.dt-buttons a.btn.processing:after {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 16px;
+  height: 16px;
+  margin: -8px 0 0 -8px;
+  box-sizing: border-box;
+  display: block;
+  content: ' ';
+  border: 2px solid #282828;
+  border-radius: 50%;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  animation: dtb-spinner 1500ms infinite linear;
+  -o-animation: dtb-spinner 1500ms infinite linear;
+  -ms-animation: dtb-spinner 1500ms infinite linear;
+  -webkit-animation: dtb-spinner 1500ms infinite linear;
+  -moz-animation: dtb-spinner 1500ms infinite linear;
+}

data/app/assets/stylesheets/dataTables/dataTables.bootstrap.css

@@ -117,22 +117,25 @@ div.dataTables_scrollHead table.dataTable {
   margin-bottom: 0 !important;
 }
 
-div.dataTables_scrollBody table {
+div.dataTables_scrollBody > table {
   border-top: none;
   margin-top: 0 !important;
   margin-bottom: 0 !important;
 }
-div.dataTables_scrollBody table thead .sorting:after,
-div.dataTables_scrollBody table thead .sorting_asc:after,
-div.dataTables_scrollBody table thead .sorting_desc:after {
+div.dataTables_scrollBody > table > thead .sorting:after,
+div.dataTables_scrollBody > table > thead .sorting_asc:after,
+div.dataTables_scrollBody > table > thead .sorting_desc:after {
   display: none;
 }
-div.dataTables_scrollBody table tbody tr:first-child th,
-div.dataTables_scrollBody table tbody tr:first-child td {
+div.dataTables_scrollBody > table > tbody > tr:first-child > th,
+div.dataTables_scrollBody > table > tbody > tr:first-child > td {
   border-top: none;
 }
 
-div.dataTables_scrollFoot table {
+div.dataTables_scrollFoot > .dataTables_scrollFootInner {
+  box-sizing: content-box;
+}
+div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
   margin-top: 0 !important;
   border-top: none;
 }

data/app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.css

@@ -8,14 +8,14 @@ table.dataTable.dtr-inline.collapsed > tbody > tr > th.child:before,
 table.dataTable.dtr-inline.collapsed > tbody > tr > td.dataTables_empty:before {
   display: none !important;
 }
-table.dataTable.dtr-inline.collapsed > tbody > tr > td:first-child,
-table.dataTable.dtr-inline.collapsed > tbody > tr > th:first-child {
+table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > td:first-child,
+table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > th:first-child {
   position: relative;
   padding-left: 30px;
   cursor: pointer;
 }
-table.dataTable.dtr-inline.collapsed > tbody > tr > td:first-child:before,
-table.dataTable.dtr-inline.collapsed > tbody > tr > th:first-child:before {
+table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > td:first-child:before,
+table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > th:first-child:before {
   top: 9px;
   left: 4px;
   height: 14px;
@@ -28,6 +28,7 @@ table.dataTable.dtr-inline.collapsed > tbody > tr > th:first-child:before {
   box-shadow: 0 0 3px #444;
   box-sizing: content-box;
   text-align: center;
+  text-indent: 0 !important;
   font-family: 'Courier New', Courier, monospace;
   line-height: 14px;
   content: '+';
@@ -38,9 +39,6 @@ table.dataTable.dtr-inline.collapsed > tbody > tr.parent > th:first-child:before
   content: '-';
   background-color: #d33333;
 }
-table.dataTable.dtr-inline.collapsed > tbody > tr.child td:before {
-  display: none;
-}
 table.dataTable.dtr-inline.collapsed.compact > tbody > tr > td:first-child,
 table.dataTable.dtr-inline.collapsed.compact > tbody > tr > th:first-child {
   padding-left: 27px;
@@ -76,6 +74,7 @@ table.dataTable.dtr-column > tbody > tr > th.control:before {
   box-shadow: 0 0 3px #444;
   box-sizing: content-box;
   text-align: center;
+  text-indent: 0 !important;
   font-family: 'Courier New', Courier, monospace;
   line-height: 14px;
   content: '+';
@@ -92,20 +91,20 @@ table.dataTable > tbody > tr.child {
 table.dataTable > tbody > tr.child:hover {
   background: transparent !important;
 }
-table.dataTable > tbody > tr.child ul {
+table.dataTable > tbody > tr.child ul.dtr-details {
   display: inline-block;
   list-style-type: none;
   margin: 0;
   padding: 0;
 }
-table.dataTable > tbody > tr.child ul li {
+table.dataTable > tbody > tr.child ul.dtr-details > li {
   border-bottom: 1px solid #efefef;
   padding: 0.5em 0;
 }
-table.dataTable > tbody > tr.child ul li:first-child {
+table.dataTable > tbody > tr.child ul.dtr-details > li:first-child {
   padding-top: 0;
 }
-table.dataTable > tbody > tr.child ul li:last-child {
+table.dataTable > tbody > tr.child ul.dtr-details > li:last-child {
   border-bottom: none;
 }
 table.dataTable > tbody > tr.child span.dtr-title {

data/app/assets/stylesheets/effective_datatables/_filters.scss

@@ -1,6 +1,7 @@
 .effective-datatables-filters { margin-bottom: 10px; }
 .effective-datatables-filters-scopes { display: inline-block; margin-right: 10px; }
 .effective-datatables-filters-inputs { display: inline-block; }
+.effective-datatables-filters-inputs span.select2-container { display: inline-block; }
 .effective-datatables-filters-inputs .form-group { margin-right: 10px; }
 .effective-datatables-filters-inputs .control-label { margin-right: 3px; }
 .effective-datatables-filters-btn { display: inline-block; }

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -1,17 +1,17 @@
 // Use asset-data-url to prevent 3 additional GET requests for icons
 table.dataTable thead .sorting {
   background-image: asset-data-url('dataTables/sort_both.png');
-  background-position: 100% 70%;
+  background-position: right 0px bottom 14px;
 }
 
 table.dataTable thead .sorting_asc {
   background-image: asset-data-url('dataTables/sort_asc.png');
-  background-position: 100% 70%;
+  background-position: right 0px bottom 14px;
 }
 
 table.dataTable thead .sorting_desc {
   background-image: asset-data-url('dataTables/sort_desc.png');
-  background-position: 100% 70%;
+  background-position: right 0px bottom 14px;
 }
 
 // Override bootstrap default glyphicons
@@ -40,8 +40,7 @@ table.dataTable thead {
   .form-control, .form-group {
     width: 100%;
     font-weight: normal;
-    margin-left: 0px;
-    margin-right: 0px;
+    margin: 0px;
   }
 
   .datatable_search__bulk_actions { margin-left: 5px; }
@@ -61,11 +60,12 @@ table.dataTable.simple {
 
 // Processing popup
 div.dataTables_wrapper div.dataTables_processing {
-  top: -20px;
+  top: -10px;
   border: none;
   box-shadow: none;
-  margin-left: -40%;
-  width: 80%;
+  margin-left: -35%;
+  margin-bottom: 0;
+  width: 70%;
 }
 
 // Show x per page
@@ -146,13 +146,11 @@ div.dataTables_wrapper div.dataTables_info {
   padding: 5px 0px 6px 6px;
 }
 
-// Collapsed responsive view
-table.dataTable > tbody > tr.child span.dtr-title { min-width: 175px; }
-table.dataTable > tbody > tr.child span.dtr-data { white-space: nowrap; }
-
-table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > td:first-child,
-table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > th:first-child {
-  padding-left: 30px !important;
+// Collapsed Responsive View
+table.dataTable > tbody > tr.child {
+  span.dtr-title { min-width: 175px; margin-bottom: 4px; }
+  span.dtr-data { white-space: nowrap; }
+  .col-resource_item { margin-bottom: 4px; }
 }
 
 // Column specific adjustments

data/app/assets/stylesheets/effective_datatables.scss

@@ -1,7 +1,6 @@
 @import 'dataTables/dataTables.bootstrap';
 
 @import 'dataTables/buttons/buttons.bootstrap';
-@import 'dataTables/colReorder/colReorder.bootstrap';
 @import 'dataTables/responsive/responsive.bootstrap';
 
 @import 'effective_datatables/filters';

data/app/helpers/effective_datatables_helper.rb

@@ -32,7 +32,7 @@ module EffectiveDatatablesHelper
         'display-start' => datatable.display_start,
         'input-js-options' => (input_js || {}).to_json.html_safe,
         'reset' => datatable_reset(datatable),
-        'simple' => simple.to_s,
+        'simple' => datatable.simple?.to_s,
         'source' => effective_datatables.datatable_path(datatable, {format: 'json'}),
         'total-records' => datatable.to_json[:recordsTotal]
       }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.2.7'.freeze
+  VERSION = '3.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.3.0
 platform: ruby
 authors:
 - Code and Effect
@@ -114,7 +114,6 @@ files:
 - app/assets/javascripts/vendor/jquery.delayedChange.js
 - app/assets/javascripts/vendor/jquery.fileDownload.js
 - app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.css
-- app/assets/stylesheets/dataTables/colReorder/colReorder.bootstrap.css
 - app/assets/stylesheets/dataTables/dataTables.bootstrap.css
 - app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.css
 - app/assets/stylesheets/effective_datatables.scss

data/app/assets/stylesheets/dataTables/colReorder/colReorder.bootstrap.css

@@ -1,11 +0,0 @@
-table.DTCR_clonedTable.dataTable {
-  position: absolute !important;
-  background-color: rgba(255, 255, 255, 0.7);
-  z-index: 202;
-}
-
-div.DTCR_pointer {
-  width: 1px;
-  background-color: #337ab7;
-  z-index: 201;
-}