oxidized-web 0.17.1 → 0.18.0

data/lib/oxidized/web/public/weblibs/buttons.bootstrap5.css

@@ -204,19 +204,37 @@ div.dt-buttons .btn.processing:after {
   -moz-animation: dtb-spinner 1500ms infinite linear;
 }
 
-div.dropdown-menu.dt-button-collection {
+div.dt-button-collection {
+  position: absolute;
+  min-width: 200px;
   margin-top: 4px;
-  width: 200px;
+  z-index: 2002;
+  background-color: var(--bs-body-bg);
+  border: var(--bs-border-width) solid var(--bs-border-color);
+  border-radius: var(--bs-border-radius);
+  box-shadow: var(--bs-box-shadow);
 }
-div.dropdown-menu.dt-button-collection .dt-button {
+div.dt-button-collection div.dt-button-collection-title {
+  padding: 0.75em 0 0.25em;
+}
+div.dt-button-collection .dropdown-menu {
   position: relative;
+  display: block;
+  width: 100%;
+  background-color: transparent;
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
 }
-div.dropdown-menu.dt-button-collection .dt-button.dropdown-toggle::after {
+div.dt-button-collection .dt-button {
+  position: relative;
+}
+div.dt-button-collection .dt-button.dropdown-toggle::after {
   position: absolute;
   right: 12px;
   top: 14px;
 }
-div.dropdown-menu.dt-button-collection div.dt-button-split {
+div.dt-button-collection div.dt-button-split {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
@@ -224,12 +242,11 @@ div.dropdown-menu.dt-button-collection div.dt-button-split {
   align-content: flex-start;
   align-items: stretch;
 }
-div.dropdown-menu.dt-button-collection div.dt-button-split a:first-child {
+div.dt-button-collection div.dt-button-split > *:first-child {
   min-width: auto;
   flex: 1 0 50px;
-  padding-right: 0;
 }
-div.dropdown-menu.dt-button-collection div.dt-button-split button:last-child {
+div.dt-button-collection div.dt-button-split button:last-child {
   min-width: 33px;
   flex: 0;
   background: transparent;
@@ -239,11 +256,11 @@ div.dropdown-menu.dt-button-collection div.dt-button-split button:last-child {
   padding: var(--bs-dropdown-item-padding-y) var(--bs-dropdown-item-padding-x);
   overflow: visible;
 }
-div.dropdown-menu.dt-button-collection div.dt-button-split button:last-child:hover {
+div.dt-button-collection div.dt-button-split button:last-child:hover {
   color: var(--bs-dropdown-link-hover-color);
   background-color: var(--bs-dropdown-link-hover-bg);
 }
-div.dropdown-menu.dt-button-collection.fixed {
+div.dt-button-collection.fixed {
   position: fixed;
   display: block;
   top: 50%;
@@ -253,73 +270,73 @@ div.dropdown-menu.dt-button-collection.fixed {
   background-color: white;
   padding: 0.5em;
 }
-div.dropdown-menu.dt-button-collection.fixed.two-column {
+div.dt-button-collection.fixed.two-column {
   margin-left: -200px;
 }
-div.dropdown-menu.dt-button-collection.fixed.three-column {
+div.dt-button-collection.fixed.three-column {
   margin-left: -225px;
 }
-div.dropdown-menu.dt-button-collection.fixed.four-column {
+div.dt-button-collection.fixed.four-column {
   margin-left: -300px;
 }
-div.dropdown-menu.dt-button-collection.fixed.columns {
+div.dt-button-collection.fixed.columns {
   margin-left: -409px;
 }
 @media screen and (max-width: 1024px) {
-  div.dropdown-menu.dt-button-collection.fixed.columns {
+  div.dt-button-collection.fixed.columns {
     margin-left: -308px;
   }
 }
 @media screen and (max-width: 640px) {
-  div.dropdown-menu.dt-button-collection.fixed.columns {
+  div.dt-button-collection.fixed.columns {
     margin-left: -203px;
   }
 }
 @media screen and (max-width: 460px) {
-  div.dropdown-menu.dt-button-collection.fixed.columns {
+  div.dt-button-collection.fixed.columns {
     margin-left: -100px;
   }
 }
-div.dropdown-menu.dt-button-collection.fixed > :last-child {
+div.dt-button-collection.fixed > :last-child {
   max-height: 100vh;
   overflow: auto;
 }
-div.dropdown-menu.dt-button-collection.two-column > :last-child, div.dropdown-menu.dt-button-collection.three-column > :last-child, div.dropdown-menu.dt-button-collection.four-column > :last-child {
+div.dt-button-collection.two-column > :last-child, div.dt-button-collection.three-column > :last-child, div.dt-button-collection.four-column > :last-child {
   display: block !important;
   column-gap: 8px;
 }
-div.dropdown-menu.dt-button-collection.two-column > :last-child > *, div.dropdown-menu.dt-button-collection.three-column > :last-child > *, div.dropdown-menu.dt-button-collection.four-column > :last-child > * {
+div.dt-button-collection.two-column > :last-child > *, div.dt-button-collection.three-column > :last-child > *, div.dt-button-collection.four-column > :last-child > * {
   -webkit-column-break-inside: avoid;
   break-inside: avoid;
 }
-div.dropdown-menu.dt-button-collection.two-column {
+div.dt-button-collection.two-column {
   width: 400px;
 }
-div.dropdown-menu.dt-button-collection.two-column > :last-child {
+div.dt-button-collection.two-column > :last-child {
   padding-bottom: 1px;
   column-count: 2;
 }
-div.dropdown-menu.dt-button-collection.three-column {
+div.dt-button-collection.three-column {
   width: 450px;
 }
-div.dropdown-menu.dt-button-collection.three-column > :last-child {
+div.dt-button-collection.three-column > :last-child {
   padding-bottom: 1px;
   column-count: 3;
 }
-div.dropdown-menu.dt-button-collection.four-column {
+div.dt-button-collection.four-column {
   width: 600px;
 }
-div.dropdown-menu.dt-button-collection.four-column > :last-child {
+div.dt-button-collection.four-column > :last-child {
   padding-bottom: 1px;
   column-count: 4;
 }
-div.dropdown-menu.dt-button-collection .dt-button {
+div.dt-button-collection .dt-button {
   border-radius: 0;
 }
-div.dropdown-menu.dt-button-collection.columns {
+div.dt-button-collection.columns {
   width: auto;
 }
-div.dropdown-menu.dt-button-collection.columns > :last-child {
+div.dt-button-collection.columns > :last-child {
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
@@ -328,38 +345,38 @@ div.dropdown-menu.dt-button-collection.columns > :last-child {
   width: 818px;
   padding-bottom: 1px;
 }
-div.dropdown-menu.dt-button-collection.columns > :last-child .dt-button {
+div.dt-button-collection.columns > :last-child .dt-button {
   min-width: 200px;
   flex: 0 1;
   margin: 0;
 }
-div.dropdown-menu.dt-button-collection.columns.dtb-b3 > :last-child, div.dropdown-menu.dt-button-collection.columns.dtb-b2 > :last-child, div.dropdown-menu.dt-button-collection.columns.dtb-b1 > :last-child {
+div.dt-button-collection.columns.dtb-b3 > :last-child, div.dt-button-collection.columns.dtb-b2 > :last-child, div.dt-button-collection.columns.dtb-b1 > :last-child {
   justify-content: space-between;
 }
-div.dropdown-menu.dt-button-collection.columns.dtb-b3 .dt-button {
+div.dt-button-collection.columns.dtb-b3 .dt-button {
   flex: 1 1 32%;
 }
-div.dropdown-menu.dt-button-collection.columns.dtb-b2 .dt-button {
+div.dt-button-collection.columns.dtb-b2 .dt-button {
   flex: 1 1 48%;
 }
-div.dropdown-menu.dt-button-collection.columns.dtb-b1 .dt-button {
+div.dt-button-collection.columns.dtb-b1 .dt-button {
   flex: 1 1 100%;
 }
 @media screen and (max-width: 1024px) {
-  div.dropdown-menu.dt-button-collection.columns > :last-child {
+  div.dt-button-collection.columns > :last-child {
     width: 612px;
   }
 }
 @media screen and (max-width: 640px) {
-  div.dropdown-menu.dt-button-collection.columns > :last-child {
+  div.dt-button-collection.columns > :last-child {
     width: 406px;
   }
-  div.dropdown-menu.dt-button-collection.columns.dtb-b3 .dt-button {
+  div.dt-button-collection.columns.dtb-b3 .dt-button {
     flex: 0 1 32%;
   }
 }
 @media screen and (max-width: 460px) {
-  div.dropdown-menu.dt-button-collection.columns > :last-child {
+  div.dt-button-collection.columns > :last-child {
     width: 200px;
   }
 }
@@ -389,7 +406,7 @@ div.dt-button-info {
   border: 1px solid var(--bs-border-color-translucent);
 }
 
-:root[data-bs-theme=dark] div.dropdown-menu.dt-button-collection.fixed {
+:root[data-bs-theme=dark] div.dt-button-collection.fixed {
   background-color: var(--bs-body-bg);
   border: 1px solid var(--bs-border-color-translucent);
 }

data/lib/oxidized/web/public/weblibs/buttons.bootstrap5.js

@@ -67,17 +67,25 @@ $.extend(true, DataTable.Buttons.defaults, {
 		collection: {
 			container: {
 				tag: 'div',
-				className: 'dropdown-menu dt-button-collection'
+				className: 'dt-button-collection',
+				content: {
+					tag: 'ul',
+					className: 'dropdown-menu show'
+				}
 			},
 			closeButton: false,
 			button: {
-				tag: 'a',
-				className: 'dt-button dropdown-item',
-				active: 'dt-button-active',
+				tag: 'li',
+				className: 'dt-button',
+				active: 'dt-button-active-a',
 				disabled: 'disabled',
+				liner: {
+					tag: 'a',
+					className: 'dropdown-item'
+				},
 				spacer: {
-					className: 'dropdown-divider',
-					tag: 'hr'
+					className: 'divider',
+					tag: 'li'
 				}
 			}
 		},

data/lib/oxidized/web/public/weblibs/dataTables.bootstrap5.css

@@ -1,11 +1,12 @@
 :root {
   --dt-row-selected: 13, 110, 253;
   --dt-row-selected-text: 255, 255, 255;
-  --dt-row-selected-link: 9, 10, 11;
+  --dt-row-selected-link: 228, 228, 228;
   --dt-row-stripe: 0, 0, 0;
   --dt-row-hover: 0, 0, 0;
   --dt-column-ordering: 0, 0, 0;
   --dt-header-align-items: center;
+  --dt-header-vertical-align: middle;
   --dt-html-background: white;
 }
 :root.dark {
@@ -100,7 +101,7 @@ table.dataTable thead > tr > td.dt-ordering-asc span.dt-column-order,
 table.dataTable thead > tr > td.dt-ordering-desc span.dt-column-order {
   position: relative;
   width: 12px;
-  height: 20px;
+  height: 24px;
 }
 table.dataTable thead > tr > th.dt-orderable-asc span.dt-column-order:before, table.dataTable thead > tr > th.dt-orderable-asc span.dt-column-order:after, table.dataTable thead > tr > th.dt-orderable-desc span.dt-column-order:before, table.dataTable thead > tr > th.dt-orderable-desc span.dt-column-order:after, table.dataTable thead > tr > th.dt-ordering-asc span.dt-column-order:before, table.dataTable thead > tr > th.dt-ordering-asc span.dt-column-order:after, table.dataTable thead > tr > th.dt-ordering-desc span.dt-column-order:before, table.dataTable thead > tr > th.dt-ordering-desc span.dt-column-order:after,
 table.dataTable thead > tr > td.dt-orderable-asc span.dt-column-order:before,
@@ -132,7 +133,8 @@ table.dataTable thead > tr > td.dt-ordering-asc span.dt-column-order:before,
 table.dataTable thead > tr > td.dt-ordering-desc span.dt-column-order:after {
   opacity: 0.6;
 }
-table.dataTable thead > tr > th.sorting_desc_disabled span.dt-column-order:after, table.dataTable thead > tr > th.sorting_asc_disabled span.dt-column-order:before,
+table.dataTable thead > tr > th.dt-orderable-none:not(.dt-ordering-asc, .dt-ordering-desc) span.dt-column-order:empty, table.dataTable thead > tr > th.sorting_desc_disabled span.dt-column-order:after, table.dataTable thead > tr > th.sorting_asc_disabled span.dt-column-order:before,
+table.dataTable thead > tr > td.dt-orderable-none:not(.dt-ordering-asc, .dt-ordering-desc) span.dt-column-order:empty,
 table.dataTable thead > tr > td.sorting_desc_disabled span.dt-column-order:after,
 table.dataTable thead > tr > td.sorting_asc_disabled span.dt-column-order:before {
   display: none;
@@ -328,6 +330,7 @@ table.dataTable thead td,
 table.dataTable tfoot th,
 table.dataTable tfoot td {
   text-align: left;
+  vertical-align: var(--dt-header-vertical-align);
 }
 table.dataTable thead th.dt-head-left,
 table.dataTable thead td.dt-head-left,
@@ -410,10 +413,6 @@ table.dataTable tbody td.dt-body-nowrap {
   white-space: nowrap;
 }
 
-:root {
-  --dt-header-align-items: flex-end;
-}
-
 /*! Bootstrap 5 integration for DataTables
  *
  * ©2020 SpryMedia Ltd, all rights reserved.
@@ -441,7 +440,7 @@ table.table.dataTable > tbody > tr.selected > * {
   color: rgb(var(--dt-row-selected-text));
 }
 table.table.dataTable > tbody > tr.selected a {
-  color: rgb(9, 10, 11);
+  color: rgb(228, 228, 228);
   color: rgb(var(--dt-row-selected-link));
 }
 table.table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) > * {

data/lib/oxidized/web/public/weblibs/dataTables.buttons.js

@@ -1,4 +1,4 @@
-/*! Buttons for DataTables 3.2.4
+/*! Buttons for DataTables 3.2.5
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -224,7 +224,7 @@ $.extend(Buttons.prototype, {
 			idx = split[split.length - 1] * 1;
 		}
 
-		this._expandButton(
+		let node = this._expandButton(
 			buttons,
 			config,
 			config !== undefined ? config.split : undefined,
@@ -240,7 +240,7 @@ $.extend(Buttons.prototype, {
 			this._draw();
 		}
 
-		return this;
+		return node;
 	},
 
 	/**
@@ -646,6 +646,7 @@ $.extend(Buttons.prototype, {
 		var isSplit = false;
 		var domCollection = this.c.dom.collection;
 		var buttons = !Array.isArray(button) ? [button] : button;
+		var lastButton;
 
 		if (button === undefined) {
 			buttons = !Array.isArray(split) ? [split] : split;
@@ -765,7 +766,11 @@ $.extend(Buttons.prototype, {
 			if (conf.init) {
 				conf.init.call(dt.button(built.node), dt, $(built.node), conf);
 			}
+
+			lastButton = built.node;
 		}
+
+		return lastButton;
 	},
 
 	/**
@@ -2043,8 +2048,7 @@ Buttons.stripData = function (str, config) {
 
 	// Prevent Excel from running a formula
 	if (!config || config.escapeExcelFormula) {
-		if (str.match(/^[=+\-@\t\r]/)) {
-			console.log('matching and updateing');
+		if (str.match(/^[=@\t\r]/)) {
 			str = "'" + str;
 		}
 	}
@@ -2167,7 +2171,7 @@ Buttons.defaults = {
  * @type {string}
  * @static
  */
-Buttons.version = '3.2.4';
+Buttons.version = '3.2.5';
 
 $.extend(_dtButtons, {
 	collection: {
@@ -2551,6 +2555,7 @@ DataTable.Api.register('buttons().container()', function () {
 // Add a new button
 DataTable.Api.register('button().add()', function (idx, conf, draw) {
 	var ctx = this.context;
+	var node;
 
 	// Don't use `this` as it could be empty - select the instances directly
 	if (ctx.length) {
@@ -2560,11 +2565,13 @@ DataTable.Api.register('button().add()', function (idx, conf, draw) {
 		);
 
 		if (inst.length) {
-			inst[0].add(conf, idx, draw);
+			node = inst[0].add(conf, idx, draw);
 		}
 	}
 
-	return this.button(this._groupSelector, idx);
+	return node
+		? this.button(this._groupSelector, node)
+		: this;
 });
 
 // Destroy the button sets selected