@osimatic/helpers-js 1.5.11 → 1.5.13

package/form_date.js

@@ -1,10 +1,16 @@
+const { toEl } = require('./util');
 const { DateTime } = require('./date_time');
 
 // input period de type : Du <input type="date" name="start_date" /> au <input type="date" name="end_date" />
 class InputPeriod {
 
 	static addLinks(form) {
-		let divParent = form.querySelector('input[type="date"][data-add_period_select_links]').parentElement;
+		form = toEl(form);
+		const input = form.querySelector('input[type="date"][data-add_period_select_links]');
+		if (!input) {
+			return;
+		}
+		let divParent = input.parentElement;
 		if (divParent.classList.contains('input-group')) {
 			divParent = divParent.parentElement;
 		}
@@ -22,6 +28,7 @@ class InputPeriod {
 	}
 
 	static init(form) {
+		form = toEl(form);
 		//console.log(form.querySelector('a.period_select_current_week'));
 
 		const linkToday = form.querySelector('a.period_select_today');
@@ -136,6 +143,7 @@ class InputPeriod {
 class FormDate {
 
 	static fillYearSelect(select, nbYearsBefore=5, nbYearsAfter=0) {
+		select = toEl(select);
 		const currentDate = new Date();
 		for (let year=currentDate.getUTCFullYear()-nbYearsBefore; year<=(currentDate.getUTCFullYear()+nbYearsAfter); year++) {
 			select.insertAdjacentHTML('beforeend', '<option value="'+year+'">'+year+'</option>');
@@ -143,18 +151,21 @@ class FormDate {
 	}
 
 	static fillMonthSelect(select, locale) {
+		select = toEl(select);
 		for (let month=1; month<=12; month++) {
 			select.insertAdjacentHTML('beforeend', '<option value="'+month+'">'+DateTime.getMonthNameByMonth(month, locale).capitalize()+'</option>');
 		}
 	}
 
 	static fillDayOfWeekSelect(select, locale) {
+		select = toEl(select);
 		for (let dayOfWeek=1; dayOfWeek<=7; dayOfWeek++) {
 			select.insertAdjacentHTML('beforeend', '<option value="'+dayOfWeek+'">'+DateTime.getDayNameByDayOfWeek(dayOfWeek, locale).capitalize()+'</option>');
 		}
 	}
 
 	static initForm(form) {
+		form = toEl(form);
 
 		function fillPeriodSelect(select) {
 			Object.entries(FormDate.getPeriodList()).forEach(([idx, tabListPeriode]) => {

package/form_helper.js

@@ -366,10 +366,11 @@ class FormHelper {
 	// ------------------------------------------------------------
 
 	static buttonLoader(button, action) {
+		const wasJQuery = button && button.jquery;
 		button = toEl(button);
 		if (action === 'start' || action === 'loading') {
 			if (button.disabled) {
-				return button;
+				return wasJQuery && typeof $ !== 'undefined' ? $(button) : button;
 			}
 			button.disabled = true;
 			button.dataset.btnText = button.innerHTML;
@@ -391,7 +392,7 @@ class FormHelper {
 			button.classList.remove('disabled');
 			button.disabled = false;
 		}
-		return button;
+		return wasJQuery && typeof $ !== 'undefined' ? $(button) : button;
 	}
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.5.11",
+  "version": "1.5.13",
   "main": "main.js",
   "scripts": {
     "test": "jest",

package/select_all.js

@@ -29,6 +29,7 @@ class SelectAll {
 	}
 
 	static updateFormGroup(formGroup) {
+		formGroup = toEl(formGroup);
 		const allCheckbox = formGroup.querySelectorAll('input[type="checkbox"]:not(.check_all)');
 		const allCheckboxChecked = formGroup.querySelectorAll('input[type="checkbox"]:not(.check_all):checked');
 		const lienSelectAll = formGroup.querySelector('a.check_all');
@@ -70,6 +71,7 @@ class SelectAll {
 	}
 
 	static updateTable(table) {
+		table = toEl(table);
 		const allCheckbox = table.querySelectorAll('tbody input[type="checkbox"]');
 		const allCheckboxChecked = table.querySelectorAll('tbody input[type="checkbox"]:checked');
 		const checkboxSelectAll = table.querySelector('thead input.check_all');
@@ -107,6 +109,7 @@ class SelectAll {
 	}
 
 	static updateDiv(div) {
+		div = toEl(div);
 		// 22/11/2021 : rajout :not(.check_all) sinon si toutes les cases sont coché, la case select all n'est pas coché à l'initialisation
 		const allCheckbox = div.querySelectorAll('div.checkbox input[type="checkbox"]:not(.check_all), div.form-check input[type="checkbox"]:not(.check_all)');
 		const allCheckboxChecked = div.querySelectorAll('div.checkbox input[type="checkbox"]:not(.check_all):checked, div.form-check input[type="checkbox"]:not(.check_all):checked');

package/tests/form_date.test.js

@@ -651,6 +651,14 @@ describe('InputPeriod', () => {
 		});
 	});
 
+	test('should not throw when form has no input[data-add_period_select_links]', () => {
+		document.body.innerHTML = `<form><div><input type="date" /></div></form>`;
+		const form = document.querySelector('form');
+
+		expect(() => InputPeriod.addLinks(form)).not.toThrow();
+		expect(form.querySelector('.select_period_links')).toBeNull();
+	});
+
 	describe('init', () => {
 		test('should set up click handlers for all period links', () => {
 			const linkSelectors = [