equal
deleted
inserted
replaced
1844 var progressEndCallback; |
1844 var progressEndCallback; |
1845 |
1845 |
1846 // Inner progress status handler |
1846 // Inner progress status handler |
1847 function _getProgress(handler, progress_id) { |
1847 function _getProgress(handler, progress_id) { |
1848 |
1848 |
1849 var interval; |
1849 var timeout; |
1850 |
1850 |
1851 function _clearProgressStatus() { |
1851 function _clearProgressStatus() { |
1852 clearInterval(interval); |
1852 clearTimeout(timeout); |
1853 ams.form.resetAfterSubmit(form, button); |
1853 ams.form.resetAfterSubmit(form, button); |
1854 button.html(button.data('ams-progress-content')); |
1854 button.html(button.data('ams-progress-content')); |
1855 ams.executeFunctionByName(progressEndCallback, form, button); |
1855 ams.executeFunctionByName(progressEndCallback, form, button); |
1856 ams.form.resetChanged(form); |
1856 ams.form.resetChanged(form); |
1857 } |
1857 } |
1872 } else { |
1872 } else { |
1873 text += '...'; |
1873 text += '...'; |
1874 } |
1874 } |
1875 button.text(text); |
1875 button.text(text); |
1876 } |
1876 } |
|
1877 timeout = setTimeout(_getProgressStatus, progressInterval); |
1877 } else if (result.status === 'finished') { |
1878 } else if (result.status === 'finished') { |
1878 _clearProgressStatus(); |
1879 _clearProgressStatus(); |
1879 } |
1880 } |
1880 } else { |
1881 } else { |
1881 _clearProgressStatus(); |
1882 _clearProgressStatus(); |
1882 } |
1883 } |
1883 }); |
1884 }); |
1884 } |
1885 } |
1885 |
1886 |
1886 button.button('loading'); |
1887 button.button('loading'); |
1887 interval = setInterval(_getProgressStatus, progressInterval); |
1888 timeout = setTimeout(_getProgressStatus, progressInterval); |
1888 } |
1889 } |
1889 |
1890 |
1890 // Initialize form data |
1891 // Initialize form data |
1891 if (submitOptions) { |
1892 if (submitOptions) { |
1892 formDataCallback = submitOptions.formDataInitCallback; |
1893 formDataCallback = submitOptions.formDataInitCallback; |