@osimatic/helpers-js 1.0.80 → 1.0.83

package/form_helper.js

@@ -1,39 +1,57 @@
 class FormHelper {
-	static resetSelectOption(form, selectName) {
-		form.find('select[name="'+selectName+'"] option').prop('disabled', false).prop('selected', false);
-	}
-	static setSelectedSelectOption(form, selectName, optionValue) {
-		form.find('select[name="'+selectName+'"] option[value="'+optionValue+'"]').prop('selected', true);
-	}
-	static setSelectedSelectOptions(form, selectName, optionValues) {
-		$.each(optionValues, function(idx, id) {
-			FormHelper.setSelectedSelectOption(form, selectName, id);
-		});
-	}
-	static disableSelectOption(form, selectName, optionValue) {
-		form.find('select[name="'+selectName+'"] option[value="'+optionValue+'"]').prop('disabled', true);
-	}
-	static disableSelectOptions(form, selectName, optionValues) {
-		$.each(optionValues, function(idx, id) {
-			FormHelper.disableSelectOption(form, selectName, id);
+	static init(form, onSubmitCallback, submitButton) {
+		FormHelper.reset(form, submitButton);
+		submitButton = typeof submitButton != 'undefined' && null != submitButton ? submitButton : form.find('button[name="validate"]');
+		submitButton.off('click').click(function(e) {
+			e.preventDefault();
+			FormHelper.buttonLoader($(this), 'loading');
+			FormHelper.hideFormErrors(form);
+			if (typeof onSubmitCallback == 'function') {
+				onSubmitCallback(form, submitButton);
+			}
 		});
-	}
-	static countSelectOptions(form, selectName) {
-		return form.find('select[name="'+selectName+'"] option:not([disabled])').length;
+		return form;
 	}
 
-	static reset(form, submitButton) {
-		form.find('[name]').each((idx, el) => $(el).val(''));
+	static reset(form) {
+		form.find('input[name]:not([type="checkbox"], [type="radio"]), select, textarea').each((idx, el) => $(el).val(''));
 		FormHelper.buttonLoader(form.find('button'), 'reset');
 		FormHelper.hideFormErrors(form);
+		return form;
+	}
 
-		if (typeof submitButton != 'undefined' && null != submitButton) {
-			FormHelper.buttonLoader(submitButton, 'reset');
-		}
+	static populateForm(form, data) {
+		form.find('[name="employees_display_type"][value="NONE"]').prop('checked', true); //todo à retirer
 
-		return form;
+		$.each(data, function(key, value) {
+			if (value == null) {
+				return;
+			}
+
+			if (typeof value == 'object') {
+				var select = form.find('[name="'+key+'[]"]');
+				select.find('option').prop('selected', false);
+				select.data('default_id', value.join(','));
+				$.each(value, function(key, val) {
+					select.find('option[value="'+val+'"]').prop('selected', true);
+				});
+				return;
+			}
+
+			var input = form.find('[name="'+key+'"]');
+
+			if (input.prop('type') === 'radio' || input.prop('type') === 'checkbox') {
+				input.prop('checked', false);
+				input.filter('[value="'+value+'"]').prop('checked', true);
+				return;
+			}
+
+			input.val(value);
+			// console.log(form.find('[name="'+key+'"]').length);
+		});
 	}
 
+
 	static getFormData(form) {
 		// var formElement = document.getElementById("myFormElement");
 		return new FormData(form[0]);
@@ -60,36 +78,57 @@ class FormHelper {
 	}
 
 
-	static populateForm(form, data) {
-		form.find('[name="employees_display_type"][value="NONE"]').prop('checked', true); //todo à retirer
-		
-		$.each(data, function(key, value) {
-			if (value == null) {
-				return;
-			}
 
-			if (typeof value == 'object') {
-				var select = form.find('[name="'+key+'[]"]');
-				select.find('option').prop('selected', false);
-				select.data('default_id', value.join(','));
-				$.each(value, function(key, val) {
-					select.find('option[value="'+val+'"]').prop('selected', true);
-				});
-				return;
-			}
+	// ------------------------------------------------------------
+	// Input text
+	// ------------------------------------------------------------
 
-			var input = form.find('[name="'+key+'"]');
+	static getInputValue(input) {
+		if (typeof input == 'undefined') {
+			return null;
+		}
+		let value = $(input).val();
+		if (value === null || value === '') {
+			return null;
+		}
+		return value;
+	}
 
-			if (input.prop('type') === 'radio' || input.prop('type') === 'checkbox') {
-				input.prop('checked', false);
-				input.filter('[value="'+value+'"]').prop('checked', true);
-				return;
-			}
+	static getLinesOfTextarea(textarea) {
+		return textarea.val().replace(/(\r\n|\n|\r)/g, "\n").split("\n").filter(word => word.length > 0);
+	}
 
-			input.val(value);
-			// console.log(form.find('[name="'+key+'"]').length);
+	// ------------------------------------------------------------
+	// Select
+	// ------------------------------------------------------------
+
+	static resetSelectOption(form, selectName) {
+		form.find('select[name="'+selectName+'"] option').prop('disabled', false).prop('selected', false);
+	}
+	static setSelectedSelectOption(form, selectName, optionValue) {
+		form.find('select[name="'+selectName+'"] option[value="'+optionValue+'"]').prop('selected', true);
+	}
+	static setSelectedSelectOptions(form, selectName, optionValues) {
+		$.each(optionValues, function(idx, id) {
+			FormHelper.setSelectedSelectOption(form, selectName, id);
 		});
 	}
+	static disableSelectOption(form, selectName, optionValue) {
+		form.find('select[name="'+selectName+'"] option[value="'+optionValue+'"]').prop('disabled', true);
+	}
+	static disableSelectOptions(form, selectName, optionValues) {
+		$.each(optionValues, function(idx, id) {
+			FormHelper.disableSelectOption(form, selectName, id);
+		});
+	}
+	static countSelectOptions(form, selectName) {
+		return form.find('select[name="'+selectName+'"] option:not([disabled])').length;
+	}
+
+
+	// ------------------------------------------------------------
+	// Checkbox
+	// ------------------------------------------------------------
 
 	static getCheckedValues(inputs) {
 		return inputs.map(function() {
@@ -111,21 +150,6 @@ class FormHelper {
 		}).get().filter(word => word.length > 0);
 	}
 
-	static getInputValue(input) {
-		if (typeof input == 'undefined') {
-			return null;
-		}
-		let value = $(input).val();
-		if (value === null || value === '') {
-			return null;
-		}
-		return value;
-	}
-
-	static getLinesOfTextarea(textarea) {
-		return textarea.val().replace(/(\r\n|\n|\r)/g, "\n").split("\n").filter(word => word.length > 0);
-	}
-
 
 	// ------------------------------------------------------------
 	// Champs
@@ -177,7 +201,7 @@ class FormHelper {
 	}
 
 	// ------------------------------------------------------------
-	// Messages
+	// Messages erreur
 	// ------------------------------------------------------------
 
 	static extractErrorKeyOfJson(json, onlyIfUniqueError) {
@@ -265,6 +289,10 @@ class FormHelper {
 	}
 
 
+	// ------------------------------------------------------------
+	// Bouton valider
+	// ------------------------------------------------------------
+
 	static buttonLoader(button, action) {
 		button = $(button);
 		if (action === 'start' || action === 'loading') {
@@ -293,19 +321,6 @@ class FormHelper {
 		return button;
 	}
 	
-	
-	
-	
-
-	/** @deprecated **/
-	static logRequestFailure(status, exception) {
-		console.log('request failure. Status: '+status+' ; Exception: '+exception);
-	}
-
-	/** @deprecated **/
-	static displayFormErrorsFromXhr(form, btnSubmit, xhr) {
-		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
-	}
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.80",
+  "version": "1.0.83",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"