src/pyams_skin/resources/js/myams-form.js
changeset 523 c08b8f12dab5
parent 489 63ea9a94bd47
child 539 5f7cda8f9da3
--- a/src/pyams_skin/resources/js/myams-form.js	Thu Feb 14 17:38:29 2019 +0100
+++ b/src/pyams_skin/resources/js/myams-form.js	Fri Mar 01 14:25:43 2019 +0100
@@ -195,10 +195,10 @@
 											   // Inner progress status handler
 											   function _getProgress(handler, progress_id) {
 
-												   var interval;
+												   var timeout;
 
 												   function _clearProgressStatus() {
-													   clearInterval(interval);
+													   clearTimeout(timeout);
 													   ams.form.resetAfterSubmit(form, button);
 													   button.html(button.data('ams-progress-content'));
 													   ams.executeFunctionByName(progressEndCallback, form, button);
@@ -223,6 +223,7 @@
 																									 }
 																									 button.text(text);
 																								 }
+																								 timeout = setTimeout(_getProgressStatus, progressInterval);
 																							 } else if (result.status === 'finished') {
 																								 _clearProgressStatus();
 																							 }
@@ -233,7 +234,7 @@
 												   }
 
 												   button.button('loading');
-												   interval = setInterval(_getProgressStatus, progressInterval);
+												   timeout = setTimeout(_getProgressStatus, progressInterval);
 											   }
 
 											   // Initialize form data