adt-js-components 1.1.3 → 1.2.0

package/README.md

@@ -93,6 +93,23 @@ Attribute `data-adt-submit-form` must be included in your HTML!
 AdtJsComponents.initSubmitForm();
 ```
 
+On each submit before and after callback can be added.
+Before callback is invoked before submit and form is not submitted if the function return false.
+After callback is invoked after successed submit.
+
+```html
+<script>
+	function myConfirm() {
+		return confirm('Do you realy want to submit the form?');
+	}
+	function myAlert() {
+		alert('Data was saved.');
+	}
+</script>
+
+<button ... data-adt-submit-form-before-callback="myConfirm" data-adt-submit-form-after-callback="myAlert">Submit</button>
+```
+
 ### Ajax Select
 
 Attribute `data-adt-ajax-select` must be included in your HTML!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adt-js-components",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "JavaScript components for Nette framework",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,11 @@
     "scrollparent": "^2.0.1",
     "tinymce": "^5.7.0",
     "tinymce-i18n": "^20.12.25",
-    "jquery": "^3.4.1",
     "nette.ajax.js": "^2.3.0"
   },
+  "peerDependencies": {
+    "jquery": "^3.4.1"
+  },
   "author": "Apps Dev Team",
   "license": "MIT",
   "bugs": {

package/src/SubmitForm/index.js

@@ -22,6 +22,10 @@ function scrollToFirstError(form) {
 }
 
 function run(options) {
+
+	// Unregister ext "redirect", for own implemenation in ext "submitForm".succcess
+	$.nette.ext('redirect', null);
+
 	$.nette.ext('live').after(function($el) {
 		$el.find('[data-adt-submit-form]').find('input, textarea, select').on('input', function(e) {
 			this.classList.remove('is-invalid');
@@ -66,6 +70,14 @@ function run(options) {
 	$.nette.ext("submitForm", {
 		before: function (xhr, settings) {
 			if (settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined) {
+
+				let beforeCallback = settings.nette.el.attr('data-adt-submit-form-before-callback');
+				if (beforeCallback) {
+					if (!window[beforeCallback]()) {
+						return false;
+					}
+				}
+
 				settings.nette.form.data('enabledButtons', settings.nette.form.find('button:enabled'));
 				settings.nette.form.find('button').prop('disabled', true);
 				settings.nette.el.css('width', settings.nette.el.outerWidth());
@@ -76,8 +88,21 @@ function run(options) {
 			}
 		},
 		success: function (payload, status, xhr, settings) {
+			if (settings.nette && settings.nette.el) {
+				let afterCallback = settings.nette.el.attr('data-adt-submit-form-after-callback');
+				if (afterCallback) {
+					window[afterCallback]();
+				}
+			}
+
+			// Own implementation redirecting (same as in nette.ajax.js ext "redirect"), but after our afterCallback
+			if (payload.redirect) {
+				window.location.href = payload.redirect;
+				return false;
+			}
+
 			// if there is no redirect, we will enable buttons
-			if (!payload.redirect && settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined) {
+			if (settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined) {
 				settings.nette.el.html(settings.nette.el.data('originalContent'));
 				settings.nette.form.data('enabledButtons').each(function () {
 					$(this).prop('disabled', false);