Index: trunk/kernel/admin_templates/incs/ajax.js =================================================================== diff -u -r5496 -r6093 --- trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5496) +++ trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 6093) @@ -121,15 +121,14 @@ /*$div.style.border = '1px solid green'; $div.style.backgroundColor = '#FF0000';*/ - - var $image_base = img_path.replace('#MODULE#', 'kernel'); - $div.innerHTML = '
'+Request.progressText+'
'+escape(Request.progressText)+'
'; + + $div.innerHTML = '
'+Request.progressText+'
'+escape(Request.progressText)+'
'; return $div; } Request.getErrorHtml = function(p_req) { //TODO: implement accepted way to handle request error - return "

" + "(" + p_req.status + ") " + p_req.statusText + "

" + return '[status: ' + p_req.status + '; status_text: ' + p_req.statusText + '; responce_text: ' + p_req.responseText + ']'; } Request.serializeForm = function(theform) { @@ -220,12 +219,13 @@ return false; } - $object.showProgress($responce); - $object.Query(); + if ($object.showProgress($responce)) { + $object.Query(); + } } AjaxProgressBar.prototype.errorCallback = function($request, $params, $object) { - alert('AJAX ERROR: ' + Request.getErrorHtml($request)); + alert('AJAX Error; class: AjaxProgressBar; ' + Request.getErrorHtml($request)); } AjaxProgressBar.prototype.FormatTime = function ($seconds) { @@ -253,4 +253,5 @@ document.getElementById('progress_bar[done]').style.width = $display_progress + '%'; document.getElementById('progress_bar[left]').style.width = (100 - $display_progress) + '%'; + return $percent < 100 ? true : false; } \ No newline at end of file