@osimatic/helpers-js 1.0.73 → 1.0.74

package/form_helper.js

@@ -200,11 +200,12 @@ class FormHelper {
 	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
 		this.displayFormErrorsFromText(form, this.getFormErrorText(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
-			if (btnSubmit.buttonLoader != null) {
-				btnSubmit.buttonLoader('reset');
-			} else {
-				btnSubmit.attr('disabled', false).button('reset');
-			}
+			FormHelper.buttonLoader(btnSubmit, 'reset');
+			//if (btnSubmit.buttonLoader != null) {
+			//	btnSubmit.buttonLoader('reset');
+			//} else {
+			//	btnSubmit.attr('disabled', false).button('reset');
+			//}
 		}
 	}
 
@@ -311,7 +312,7 @@ class EditValue {
 
 			let button = $('<button type="submit" class="btn btn-success ms-2" data-loading-text="<i class=\'fa fa-circle-notch fa-spin\'></i>" style="vertical-align: baseline;"><i class="fas fa-check"></i></button>');
 			button.click(function (e) {
-				parent.find('button').buttonLoader('loading');
+				FormHelper.buttonLoader(parent.find('button'), 'loading');
 				let newValue = parent.find('input').val();
 				onSubmitCallback(newValue, parent,
 					(isSuccess, valueFormatCallback) => {

package/import_from_csv.js

@@ -24,7 +24,7 @@ class ImportFromCsv {
 
 		formUpload.find('button[type="submit"]').click(function(event) {
 			event.preventDefault();
-			$(this).buttonLoader('loading');
+			FormHelper.buttonLoader($(this), 'loading');
 			formUpload.find('div.errors').addClass('hide');
 
 			let isFileParsed = false;
@@ -69,7 +69,7 @@ class ImportFromCsv {
 					if (!isFileParsed) {
 						formUpload.find('div.errors').html(errorMessageFileEmpty).removeClass('hide');
 					}
-					formUpload.find('button[type="submit"]').buttonLoader('reset');
+					FormHelper.buttonLoader(formUpload.find('button[type="submit"]'), 'reset');
 				}
 			});
 			event.preventDefault();
@@ -77,7 +77,7 @@ class ImportFromCsv {
 
 		formMatching.find('button[type="submit"]').click(function (event) {
 			event.preventDefault();
-			$(this).buttonLoader('loading');
+			FormHelper.buttonLoader($(this), 'loading');
 			formMatching.find('div.errors').addClass('hide').empty();
 			divResult.find('table tr').removeClass('danger');
 			
@@ -86,7 +86,7 @@ class ImportFromCsv {
 
 			if ($.isEmptyObject(tabLink)) {
 				formMatching.find('div.errors').html(errorMessageImportSelectColumns).removeClass('hide');
-				$(this).buttonLoader('reset');
+				FormHelper.buttonLoader($(this), 'reset');
 				return false;
 			}
 
@@ -103,7 +103,7 @@ class ImportFromCsv {
 					else {
 						formMatching.find('div.errors').html(ImportFromCsv.getErrorsHtmlOfImportData(json, divResult)).removeClass('hide');
 					}
-					formMatching.find('button[type="submit"]').buttonLoader('reset');
+					FormHelper.buttonLoader(formMatching.find('button[type="submit"]'), 'reset');
 				}
 			);
 		});

package/media.js

@@ -15,14 +15,13 @@ class AudioMedia {
 		});
 
 		div.find('.play_asynchronously_link').off('click').click(function () {
-			if ($(this).buttonLoader('loading') != null) {
-				let button = $(this).buttonLoader('loading');
-				AudioMedia.playAudioUrl($(this).data('url'), () => button.buttonLoader('reset'));
-			} else {
-				let button = $(this).attr('disabled', true).button('loading');
-				AudioMedia.playAudioUrl($(this).data('url'), () => button.attr('disabled', false).button('reset'));
-			}
-
+			//if (FormHelper.buttonLoader($(this), 'loading') != null) {
+			let button = FormHelper.buttonLoader($(this), 'loading');
+			AudioMedia.playAudioUrl($(this).data('url'), () => FormHelper.buttonLoader(button, 'reset'));
+			//} else {
+			//	let button = $(this).attr('disabled', true).button('loading');
+			//	AudioMedia.playAudioUrl($(this).data('url'), () => button.attr('disabled', false).button('reset'));
+			//}
 			return false;
 		});
 

package/package.json

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