adt-js-components 0.0.2 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adt-js-components",
-  "version": "0.0.2",
+  "version": "1.0.5",
   "description": "JavaScript components for Nette framework",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "select2": "^4.0.13",
-    "@ttskch/select2-bootstrap4-theme": "^1.4.0",
+    "select2-bootstrap-5-theme": "^1.1.1",
     "autonumeric": "^4.6.0",
     "flatpickr": "^4.6.3",
     "script-loader": "^0.7.2",

package/src/AjaxSelect/index.js

@@ -1,6 +1,6 @@
 import 'select2';
 import 'select2/dist/css/select2.min.css';
-import '@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4.min.css';
+import 'select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.css'
 import 'select2/dist/js/i18n/cs'
 
 function run(options) {
@@ -96,7 +96,7 @@ function run(options) {
 				},
 				cache: true
 			},
-			theme: 'bootstrap4',
+			theme: 'bootstrap-5',
 			width: '100%',
 		});
 
@@ -118,4 +118,4 @@ function run(options) {
 
 }
 
-export default { run }
+export default { run }

package/src/Select2/index.js

@@ -1,6 +1,6 @@
 import 'select2';
 import 'select2/dist/css/select2.min.css';
-import '@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4.min.css'
+import 'select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.css'
 import 'select2/dist/js/i18n/cs'
 
 function run(options) {
@@ -8,9 +8,9 @@ function run(options) {
 
 		$el.find('[data-adt-select2]').each(function () {
 			// musí zde být defaultní jazyk "en", pokud zde nebyl a byla importována čeština.. tak se i bez poslání json params nastavila čeština
-			$(this).select2($.extend({theme: 'bootstrap4', language: "en"}, $(this).data('adt-select2') || {}));
+			$(this).select2($.extend({theme: 'bootstrap-5', language: "en"}, $(this).data('adt-select2') || {}));
 		});
 	});
 }
 
-export default { run }
+export default { run }

package/src/SubmitForm/index.js

@@ -3,32 +3,39 @@ const Scrollparent = require("scrollparent");
 function run(options) {
 	$.nette.ext("submitForm", {
 		before: function (xhr, settings) {
-			if (settings.nette) {
-				settings.nette.el.closest('form').find('button').prop('disabled', true);
-				settings.nette.el.find('.js-spinner').removeClass('d-none');
-				settings.nette.el.closest('form').find('.js-error').remove();
-				settings.nette.el.closest('form').find('.is-invalid').removeClass('is-invalid');
+			if (settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined) {
+				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());
+				settings.nette.el.data('originalContent', settings.nette.el.html());
+				settings.nette.el.html('<span class="spinner-border spinner-border-sm"></span>');
+				settings.nette.form.find('.alert-danger').remove();
+				settings.nette.form.find('.is-invalid').removeClass('is-invalid');
 			}
 		},
 		success: function (payload, status, xhr, settings) {
 			// if there is no redirect, we will enable buttons
-			if (!payload.redirect && settings.nette) {
-				settings.nette.el.find('.js-spinner').addClass('d-none');
-				settings.nette.el.closest('form').find('button').prop('disabled', false);
+			if (!payload.redirect && 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);
+				});
 			}
 		},
 		error: function (xhr, status, error, settings) {
-			if (settings.nette) {
-				settings.nette.el.closest('form').find('.js-errors').append('<div class="alert alert-danger js-error">' + xhr.responseJSON['error'] + '</div>');
+			if (settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined) {
+				settings.nette.form.prepend('<div class="alert alert-danger">' + xhr.responseText + '</div>');
 
-				settings.nette.el.find('.js-spinner').addClass('d-none');
-				settings.nette.el.closest('form').find('button').prop('disabled', false);
+				settings.nette.el.html(settings.nette.el.data('originalContent'));
+				settings.nette.form.data('enabledButtons').each(function () {
+					$(this).prop('disabled', false);
+				});
 			}
 		},
 		complete:  function (xhr, status, settings) {
 			// if there are errors we will scroll to first of them
-			if (settings.nette && settings.nette.el.closest('form').find('.js-error').length > 0) {
-				const $error = settings.nette.el.closest('form').find('.js-error:first');
+			if (settings.nette && settings.nette.form && settings.nette.form.attr('data-adt-submit-form') !== undefined && settings.nette.form.find('.alert-danger').length > 0) {
+				const $error = settings.nette.form.find('.alert-danger:first');
 
 				// we have to find first scrollable element (it can be document or modal for example)
 				let scrollParent = Scrollparent($error[0]);
@@ -44,4 +51,4 @@ function run(options) {
 	});
 }
 
-export default { run }
+export default { run }