equal
deleted
inserted
replaced
1436 $('.alert-danger, SPAN.state-error', form).not('.persistent').remove(); |
1436 $('.alert-danger, SPAN.state-error', form).not('.persistent').remove(); |
1437 $('.state-error', form).removeClassPrefix('state-'); |
1437 $('.state-error', form).removeClassPrefix('state-'); |
1438 // Check submit button |
1438 // Check submit button |
1439 var button = $(form.data('ams-submit-button')); |
1439 var button = $(form.data('ams-submit-button')); |
1440 if (button && !button.data('ams-form-hide-loading')) { |
1440 if (button && !button.data('ams-form-hide-loading')) { |
|
1441 button.data('ams-progress-content', button.html()); |
1441 button.button('loading'); |
1442 button.button('loading'); |
1442 } |
1443 } |
1443 ams.ajax.check($.fn.ajaxSubmit, |
1444 ams.ajax.check($.fn.ajaxSubmit, |
1444 ams.baseURL + 'ext/jquery-form-3.49' + ams.devext + '.js', |
1445 ams.baseURL + 'ext/jquery-form-3.49' + ams.devext + '.js', |
1445 function() { |
1446 function() { |
1463 function _getProgress(handler, progress_id) { |
1464 function _getProgress(handler, progress_id) { |
1464 |
1465 |
1465 var interval; |
1466 var interval; |
1466 |
1467 |
1467 function _clearProgressStatus() { |
1468 function _clearProgressStatus() { |
1468 button.button('reset'); |
|
1469 clearInterval(interval); |
1469 clearInterval(interval); |
|
1470 ams.form.resetAfterSubmit(form, button); |
|
1471 button.html(button.data('ams-progress-content')); |
1470 ams.executeFunctionByName(progressEndCallback, form, button); |
1472 ams.executeFunctionByName(progressEndCallback, form, button); |
|
1473 ams.form.resetChanged(form); |
1471 } |
1474 } |
1472 |
1475 |
1473 function _getProgressStatus() { |
1476 function _getProgressStatus() { |
1474 ams.ajax.post(handler, |
1477 ams.ajax.post(handler, |
1475 {progress_id: progress_id}, |
1478 {progress_id: progress_id}, |
1478 if (status === 'success') { |
1481 if (status === 'success') { |
1479 if (result.status === 'running') { |
1482 if (result.status === 'running') { |
1480 if (result.message) { |
1483 if (result.message) { |
1481 button.text(result.message); |
1484 button.text(result.message); |
1482 } else { |
1485 } else { |
1483 button.text(button.data('ams-progress-text') + |
1486 var text = button.data('ams-progress-text') || ams.i18n.PROGRESS; |
1484 ' ' + result.current + ' / ' + result.length); |
1487 if (result.current) { |
|
1488 text += ': ' + result.current + '/ ' + (result.length || 100); |
|
1489 } else { |
|
1490 text += '...'; |
|
1491 } |
|
1492 button.text(text); |
1485 } |
1493 } |
1486 } else if (result.status === 'finished') { |
1494 } else if (result.status === 'finished') { |
1487 _clearProgressStatus(); |
1495 _clearProgressStatus(); |
1488 } |
1496 } |
1489 } else { |
1497 } else { |
1685 var modal = $(form).parents('.modal-dialog'); |
1693 var modal = $(form).parents('.modal-dialog'); |
1686 var keepModal = modal.exists() && button.exists() && button.data('ams-keep-modal'); |
1694 var keepModal = modal.exists() && button.exists() && button.data('ams-keep-modal'); |
1687 if (modal.exists() && (keepModal !== true)) { |
1695 if (modal.exists() && (keepModal !== true)) { |
1688 ams.dialog.close(form); |
1696 ams.dialog.close(form); |
1689 } else { |
1697 } else { |
1690 setTimeout(function() { |
1698 if (!progressHandler) { |
1691 ams.form.resetAfterSubmit(form, button); |
1699 setTimeout(function () { |
1692 ams.form.resetChanged(form); |
1700 ams.form.resetAfterSubmit(form, button); |
1693 }, button.data('ams-form-reset-timeout') || 2000); |
1701 ams.form.resetChanged(form); |
|
1702 }, button.data('ams-form-reset-timeout') || 2000); |
|
1703 } |
1694 } |
1704 } |
1695 } |
1705 } |
1696 } |
1706 } |
1697 |
1707 |
1698 var hasUpload = (form.data('ams-form-ignore-uploads') !== true) && |
1708 var hasUpload = (form.data('ams-form-ignore-uploads') !== true) && |
5144 INFO: "Information", |
5154 INFO: "Information", |
5145 WARNING: "!! WARNING !!", |
5155 WARNING: "!! WARNING !!", |
5146 ERROR: "ERROR: ", |
5156 ERROR: "ERROR: ", |
5147 |
5157 |
5148 LOADING: "Loading...", |
5158 LOADING: "Loading...", |
|
5159 PROGRESS: "Processing", |
|
5160 |
5149 WAIT: "Please wait!", |
5161 WAIT: "Please wait!", |
5150 FORM_SUBMITTED: "This form was already submitted...", |
5162 FORM_SUBMITTED: "This form was already submitted...", |
5151 NO_SERVER_RESPONSE: "No response from server!", |
5163 NO_SERVER_RESPONSE: "No response from server!", |
5152 ERROR_OCCURED: "An error occured!", |
5164 ERROR_OCCURED: "An error occured!", |
5153 ERRORS_OCCURED: "Some errors occured!", |
5165 ERRORS_OCCURED: "Some errors occured!", |