oxidized-web 0.14.0 → 0.15.0

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

@@ -74,6 +74,14 @@ $.extend( true, DataTable.ext.classes, {
 	},
 	processing: {
 		container: "dt-processing card"
+	},
+	layout: {
+		row: 'row mt-2 justify-content-between',
+		cell: 'd-md-flex justify-content-between align-items-center',
+		tableCell: 'col-12',
+		start: 'dt-layout-start col-md-auto me-auto',
+		end: 'dt-layout-end col-md-auto ms-auto',
+		full: 'dt-layout-full col-md'
 	}
 } );
 
@@ -91,9 +99,10 @@ DataTable.ext.renderer.pagingButton.bootstrap = function (settings, buttonType,
 	}
 
 	var li = $('<li>').addClass(btnClasses.join(' '));
-	var a = $('<a>', {
-		'href': disabled ? null : '#',
-		'class': 'page-link'
+	var a = $('<button>', {
+		'class': 'page-link',
+		role: 'link',
+		type: 'button'
 	})
 		.html(content)
 		.appendTo(li);
@@ -108,40 +117,6 @@ DataTable.ext.renderer.pagingContainer.bootstrap = function (settings, buttonEls
 	return $('<ul/>').addClass('pagination').append(buttonEls);
 };
 
-DataTable.ext.renderer.layout.bootstrap = function ( settings, container, items ) {
-	var row = $( '<div/>', {
-			"class": items.full ?
-				'row mt-2 justify-content-md-center' :
-				'row mt-2 justify-content-between'
-		} )
-		.appendTo( container );
-
-	$.each( items, function (key, val) {
-		var klass;
-
-		// Apply start / end (left / right when ltr) margins
-		if (val.table) {
-			klass = 'col-12';
-		}
-		else if (key === 'start') {
-			klass = 'col-md-auto me-auto';
-		}
-		else if (key === 'end') {
-			klass = 'col-md-auto ms-auto';
-		}
-		else {
-			klass = 'col-md';
-		}
-
-		$( '<div/>', {
-				id: val.id || null,
-				"class": klass + ' ' + (val.className || '')
-			} )
-			.append( val.contents )
-			.appendTo( row );
-	} );
-};
-
 
 return DataTable;
 }));

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

@@ -1,4 +1,4 @@
-/*! Buttons for DataTables 3.0.2
+/*! Buttons for DataTables 3.2.2
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -302,9 +302,20 @@ $.extend(Buttons.prototype, {
 	disable: function (node) {
 		var button = this._nodeToButton(node);
 
-		$(button.node)
-			.addClass(this.c.dom.button.disabled)
-			.prop('disabled', true);
+		if (button.isSplit) {
+			$(button.node.childNodes[0])
+				.addClass(this.c.dom.button.disabled)
+				.prop('disabled', true);
+		}
+		else {
+			$(button.node)
+				.addClass(this.c.dom.button.disabled)
+				.prop('disabled', true);
+		}
+
+		button.disabled = true;
+
+		this._checkSplitEnable();
 
 		return this;
 	},
@@ -355,9 +366,21 @@ $.extend(Buttons.prototype, {
 		}
 
 		var button = this._nodeToButton(node);
-		$(button.node)
-			.removeClass(this.c.dom.button.disabled)
-			.prop('disabled', false);
+
+		if (button.isSplit) {
+			$(button.node.childNodes[0])
+				.removeClass(this.c.dom.button.disabled)
+				.prop('disabled', false);
+		}
+		else {
+			$(button.node)
+				.removeClass(this.c.dom.button.disabled)
+				.prop('disabled', false);
+		}
+
+		button.disabled = false;
+
+		this._checkSplitEnable();
 
 		return this;
 	},
@@ -670,6 +693,13 @@ $.extend(Buttons.prototype, {
 				attachTo.push(built);
 			}
 
+			// Any button type can have a drop icon set
+			if (built.conf.dropIcon && ! built.conf.split) {
+				$(built.node)
+					.addClass(this.c.dom.button.dropClass)
+					.append(this.c.dom.button.dropHtml);
+			}
+
 			// Create the dropdown for a collection
 			if (built.conf.buttons) {
 				built.collection = $(
@@ -677,8 +707,6 @@ $.extend(Buttons.prototype, {
 				);
 				built.conf._collection = built.collection;
 
-				$(built.node).append(domCollection.action.dropHtml);
-
 				this._expandButton(
 					built.buttons,
 					built.conf.buttons,
@@ -827,7 +855,7 @@ $.extend(Buttons.prototype, {
 				else {
 					run(e, dt, button, config, function () {});
 				}
-			}
+			};
 
 			var tag = config.tag || dom.tag;
 			var clickBlurs =
@@ -946,6 +974,7 @@ $.extend(Buttons.prototype, {
 				.append(button);
 
 			var dropButtonConfig = $.extend(config, {
+				autoClose: true,
 				align: dropdownConf.dropdown.align,
 				attr: {
 					'aria-haspopup': 'dialog',
@@ -982,7 +1011,8 @@ $.extend(Buttons.prototype, {
 					dropdownConf.dropdown.className +
 					' dt-button"></button>'
 			)
-				.html(dropdownConf.dropdown.dropHtml)
+				.html(this.c.dom.button.dropHtml)
+				.addClass(this.c.dom.button.dropClass)
 				.on('click.dtb', function (e) {
 					e.preventDefault();
 					e.stopPropagation();
@@ -1024,6 +1054,57 @@ $.extend(Buttons.prototype, {
 		};
 	},
 
+	/**
+	 * Spin over buttons checking if splits should be enabled or not.
+	 * @param {*} buttons Array of buttons to check
+	 */
+	_checkSplitEnable: function (buttons) {
+		if (! buttons) {
+			buttons = this.s.buttons;
+		}
+
+		for (var i=0 ; i<buttons.length ; i++) {
+			var button = buttons[i];
+
+			// Check if the button is a split one and if so, determine
+			// its state
+			if (button.isSplit) {
+				var splitBtn = button.node.childNodes[1];
+
+				if (this._checkAnyEnabled(button.buttons)) {
+					// Enable the split
+					$(splitBtn)
+						.removeClass(this.c.dom.button.disabled)
+						.prop('disabled', false);
+				}
+				else {
+					$(splitBtn)
+						.addClass(this.c.dom.button.disabled)
+						.prop('disabled', false);
+				}
+			}
+			else if (button.isCollection) {
+				// Nest down into collections
+				this._checkSplitEnable(button.buttons);
+			}
+		}
+	},
+
+	/**
+	 * Check an array of buttons and see if any are enabled in it
+	 * @param {*} buttons Button array
+	 * @returns true if a button is enabled, false otherwise
+	 */
+	_checkAnyEnabled: function (buttons) {
+		for (var i=0 ; i<buttons.length ; i++) {
+			if (! buttons[i].disabled) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
 	/**
 	 * Get the button object from a node (recursive)
 	 * @param  {node} node Button node
@@ -1037,7 +1118,7 @@ $.extend(Buttons.prototype, {
 		}
 
 		for (var i = 0, ien = buttons.length; i < ien; i++) {
-			if (buttons[i].node === node) {
+			if (buttons[i].node === node || $(buttons[i].node).children().eq(0).get(0) === node) {
 				return buttons[i];
 			}
 
@@ -1306,7 +1387,8 @@ $.extend(Buttons.prototype, {
 
 		var containerSelector =
 			options.tag + '.' + options.containerClassName.replace(/ /g, '.');
-		var hostNode = hostButton.node();
+		var hostButtonNode = hostButton.node();
+		var hostNode = options.collectionLayout.includes('fixed') ? $('body') : hostButton.node();
 
 		var close = function () {
 			closed = true;
@@ -1333,6 +1415,8 @@ $.extend(Buttons.prototype, {
 			$('body').off('.dtb-collection');
 			dt.off('buttons-action.b-internal');
 			dt.off('destroy');
+
+			$('body').trigger('buttons-popover-hide.dt');
 		};
 
 		if (content === false) {
@@ -1352,6 +1436,26 @@ $.extend(Buttons.prototype, {
 			close();
 		}
 
+		// Sort buttons if defined
+		if (options.sort) {
+			var elements = $('button', content)
+				.map(function (idx, el) {
+					return {
+						text: $(el).text(),
+						el: el
+					};
+				})
+				.toArray();
+
+			elements.sort(function (a, b) {
+				return a.text.localeCompare(b.text);
+			});
+
+			$(content).append(elements.map(function (v) {
+				return v.el;
+			}));
+		}
+
 		// Try to be smart about the layout
 		var cnt = $('.dt-button', content).length;
 		var mod = '';
@@ -1382,10 +1486,10 @@ $.extend(Buttons.prototype, {
 			.attr('role', 'menu')
 			.appendTo(display);
 
-		hostNode.attr('aria-expanded', 'true');
+		hostButtonNode.attr('aria-expanded', 'true');
 
 		if (hostNode.parents('body')[0] !== document.body) {
-			hostNode = document.body.lastChild;
+			hostNode = $(document.body).children('div, section, p').last();
 		}
 
 		if (options.popoverTitle) {
@@ -1514,7 +1618,7 @@ $.extend(Buttons.prototype, {
 					popoverSizes.marginBottom;
 			}
 
-			if (containerPosition.top + top < $(window).scrollTop()) {
+			if (offsetParent.offset().top + top < $(window).scrollTop()) {
 				// Correction for when the top is beyond the top of the page
 				top = buttonPosition.top + hostNode.outerHeight();
 			}
@@ -1882,6 +1986,11 @@ Buttons.buttonSelector = function (insts, selector) {
  * @param {*} str Data to strip
  */
 Buttons.stripData = function (str, config) {
+	// If the input is an HTML element, we can use the HTML from it (HTML might be stripped below).
+	if (str !== null && typeof str === 'object' && str.nodeName && str.nodeType) {
+		str = str.innerHTML;
+	}
+
 	if (typeof str !== 'string') {
 		return str;
 	}
@@ -1914,6 +2023,14 @@ 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');
+			str = "'" + str;
+		}
+	}
+
 	return str;
 };
 
@@ -1976,10 +2093,6 @@ Buttons.defaults = {
 			className: 'dt-buttons'
 		},
 		collection: {
-			action: {
-				// action button
-				dropHtml: '<span class="dt-button-down-arrow">&#x25BC;</span>'
-			},
 			container: {
 				// The element used for the dropdown
 				className: 'dt-button-collection',
@@ -2005,7 +2118,9 @@ Buttons.defaults = {
 			liner: {
 				tag: 'span',
 				className: ''
-			}
+			},
+			dropClass: '',
+			dropHtml: '<span class="dt-button-down-arrow">&#x25BC;</span>'
 		},
 		split: {
 			action: {
@@ -2017,7 +2132,6 @@ Buttons.defaults = {
 				// button to trigger the dropdown
 				align: 'split-right',
 				className: 'dt-button-split-drop',
-				dropHtml: '<span class="dt-button-down-arrow">&#x25BC;</span>',
 				splitAlignClass: 'dt-button-split-left',
 				tag: 'button'
 			},
@@ -2035,7 +2149,7 @@ Buttons.defaults = {
  * @type {string}
  * @static
  */
-Buttons.version = '3.0.2';
+Buttons.version = '3.2.2';
 
 $.extend(_dtButtons, {
 	collection: {
@@ -2044,6 +2158,7 @@ $.extend(_dtButtons, {
 		},
 		className: 'buttons-collection',
 		closeButton: false,
+		dropIcon: true,
 		init: function (dt, button) {
 			button.attr('aria-expanded', false);
 		},
@@ -2638,6 +2753,7 @@ var _exportData = function (dt, inOpts) {
 			stripHtml: true,
 			stripNewlines: true,
 			decodeEntities: true,
+			escapeExcelFormula: false,
 			trim: true,
 			format: {
 				header: function (d) {