@osimatic/helpers-js 1.1.56 → 1.1.58

package/flash_message.js

@@ -1,15 +1,15 @@
 class FlashMessage {
-	static displaySuccess(message, reload, modal=null) {
-		this.display('success', message, reload, modal);
+	static displaySuccess(message, reload=false, modal=null, onMessageHidden=null) {
+		this.display('success', message, reload, modal, onMessageHidden);
 	}
-	static displayWarning(message, modal=null) {
-		this.display('warning', message, false, modal);
+	static displayWarning(message, modal=null, onMessageHidden=null) {
+		this.display('warning', message, false, modal, onMessageHidden);
 	}
-	static displayError(message, modal=null) {
-		this.display('danger', message, false, modal);
+	static displayError(message, modal=null, onMessageHidden=null) {
+		this.display('danger', message, false, modal, onMessageHidden);
 	}
 
-	static display(type, message, reload, modal=null) {
+	static display(type, message, reload=false, modal=null, onMessageHidden=null) {
 		if (null !== modal) {
 			modal.modal('hide');
 		}
@@ -22,6 +22,9 @@ class FlashMessage {
 
 		setTimeout(function () {
 			$('div.snackbar').remove();
+			if (typeof onMessageHidden == 'function') {
+				onMessageHidden();
+			}
 		}, 6000);
 
 		if (true === reload) {

package/form_helper.js

@@ -234,7 +234,7 @@ class FormHelper {
 	// Messages erreur
 	// ------------------------------------------------------------
 
-	static extractErrorKeyOfJson(json, onlyIfUniqueError) {
+	static extractErrorKeyOfJson(json, onlyIfUniqueError=false) {
 		if (typeof json == 'undefined' || json == null) {
 			return null;
 		}
@@ -243,7 +243,7 @@ class FormHelper {
 			return json.error;
 		}
 
-		if (typeof onlyIfUniqueError != 'undefined' && onlyIfUniqueError && !json.length || json.length > 1) {
+		if (onlyIfUniqueError && !json.length || json.length > 1) {
 			return null;
 		}
 
@@ -267,18 +267,23 @@ class FormHelper {
 		let errorLabels = [];
 		for (let property in errors) {
 			// console.log(property);
-			if (typeof errors[property] != 'function') {
-				if (typeof errors[property]['error_description'] === 'undefined') {
-					errorLabels.push(errors[property]);
-				} else {
-					errorLabels.push(errors[property]['error_description']);
-				}
+			if (typeof errors[property] == 'function') {
+				continue;
 			}
+			if (typeof errors[property]['error_description'] !== 'undefined') {
+				errorLabels.push(errors[property]['error_description']);
+				continue;
+			}
+			if (Array.isArray(errors[property]) && errors[property].length === 2) {
+				errorLabels.push(errors[property][1]);
+				continue;
+			}
+			errorLabels.push(errors[property]);
 		}
 		return errorLabels.removeEmptyValues().map(errorLabel => '<span>' + errorLabel + '</span>').join('<br/>');
 	}
 
-	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
+	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv=null) {
 		this.displayFormErrorsFromText(form, this.getFormErrorText(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
 			FormHelper.buttonLoader(btnSubmit, 'reset');
@@ -290,10 +295,10 @@ class FormHelper {
 		}
 	}
 
-	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv) {
+	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv=null) {
 		let errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
 
-		if (typeof errorWrapperDiv != 'undefined' && errorWrapperDiv != null) {
+		if (null != errorWrapperDiv) {
 			errorWrapperDiv.append(errorDiv);
 			return;
 		}

package/location.js

@@ -7,11 +7,11 @@ class Country {
 		return '<span><img src="'+Country.getFlagPath(countryCode)+'" alt="" title="'+Country.getCountryName(countryCode)+'" class="flag" /></span>'
 	}
 
-	static fillCountrySelect(select, defaultValue) {
+	static fillCountrySelect(select, defaultValue=null) {
 		if (select.children().length === 0) {
 			Object.entries(Country.getCountries()).forEach(([countryCode, countryName]) => select.append('<option value="' + countryCode + '">' + countryName + '</option>'));
 		}
-		if (typeof defaultValue != 'undefined') {
+		if (null != defaultValue) {
 			select.val(defaultValue);
 		}
 		if (typeof select.selectpicker != 'undefined') {
@@ -309,11 +309,7 @@ class PostalAddress {
 		});
 	}
 
-	static format(addressData, separator) {
-		if (typeof separator == 'undefined') {
-			separator = '<br/>';
-		}
-
+	static format(addressData, separator='<br/>') {
 		function empty(value) {
 			return typeof value == 'undefined' || value == null || value === '';
 		}

package/package.json

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