@osimatic/helpers-js 1.5.9 → 1.5.11

package/form_helper.js

@@ -11,7 +11,8 @@ class FormHelper {
 			FormHelper.buttonLoader(this, 'loading');
 			FormHelper.hideFormErrors(form);
 			if (typeof onSubmitCallback == 'function') {
-				onSubmitCallback(form, submitButton);
+				const jq = wasJQuery && typeof $ !== 'undefined';
+				onSubmitCallback(jq ? $(form) : form, jq ? $(submitButton) : submitButton);
 			}
 		};
 		return wasJQuery && typeof $ !== 'undefined' ? $(form) : form;
@@ -384,7 +385,9 @@ class FormHelper {
 			button.classList.add('disabled');
 		}
 		if (action === 'stop' || action === 'reset') {
-			button.innerHTML = button.dataset.btnText;
+			if (button.dataset.btnText !== undefined) {
+				button.innerHTML = button.dataset.btnText;
+			}
 			button.classList.remove('disabled');
 			button.disabled = false;
 		}

package/package.json

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

package/tests/form_helper.test.js

@@ -687,6 +687,15 @@ describe('FormHelper', () => {
 
 			expect(result).toBe(btn);
 		});
+
+		test('should not overwrite innerHTML with "undefined" when reset called before loading', () => {
+			const form = setupForm();
+			const btn = addButton(form, 'validate', 'Submit');
+
+			FormHelper.buttonLoader(btn, 'reset');
+
+			expect(btn.innerHTML).toBe('Submit');
+		});
 	});
 
 	describe('getInputValue', () => {