Index: trunk/kernel/admin_templates/incs/ajax.js =================================================================== diff -u -N -r6093 -r6583 --- trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 6093) +++ trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 6583) @@ -14,7 +14,7 @@ //p_errorCallBack: callback function for erroneous response //p_pass: string of params to pass to callback functions //p_object: object of params to pass to callback functions - + if (p_busyReq) return; var req = Request.getRequest(); if (req != null) { @@ -34,15 +34,15 @@ } var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes'; req.open(Request.method, p_url + $ajax_mark, true); - + if (Request.method == 'POST') { Request.headers['Content-type'] = 'application/x-www-form-urlencoded'; Request.headers['referer'] = p_url; } else { Request.headers['If-Modified-Since'] = 'Sat, 1 Jan 2000 00:00:00 GMT'; } - + Request.sendHeaders(req); if (Request.method == 'POST') { req.send(Request.params); @@ -51,7 +51,7 @@ else { req.send(null); } - + var toId = window.setTimeout( function() {if (p_busyReq) req.abort();}, Request.timeout ); } } @@ -74,7 +74,7 @@ Request.showProgress = function(p_id) { if (p_id != '') { Request.setOpacity(20, p_id); - + if (!document.getElementById(p_id + '_progress')) { document.body.appendChild(Request.getProgressObject(p_id)); } @@ -100,7 +100,7 @@ object.opacity = (opacity / 100); object.MozOpacity = (opacity / 100); object.KhtmlOpacity = (opacity / 100); - object.filter = "alpha(opacity=" + opacity + ")"; + object.filter = "alpha(opacity=" + opacity + ")"; } Request.getProgressHtml = function() { @@ -110,15 +110,15 @@ Request.getProgressObject = function($id) { var $div = document.createElement('DIV'); var $parent_div = document.getElementById($id); - + $div.id = $id + '_progress'; - + $div.style.width = $parent_div.clientWidth + 'px'; $div.style.height = '150px'; // default height if div is empty (first ajax request for div) - $div.style.left = getRealLeft($parent_div) + 'px'; + $div.style.left = getRealLeft($parent_div) + 'px'; $div.style.top = getRealTop($parent_div) + 'px'; $div.style.position = 'absolute'; - + /*$div.style.border = '1px solid green'; $div.style.backgroundColor = '#FF0000';*/ @@ -135,41 +135,41 @@ if (typeof(theform) == 'string') { theform = document.getElementById(theform); } - + var els = theform.elements; var len = els.length; var queryString = ''; - - Request.addField = function(name, value) { + + Request.addField = function(name, value) { if (queryString.length > 0) queryString += '&'; queryString += encodeURIComponent(name) + '=' + encodeURIComponent(value); }; - + for (var i = 0; i= 0) { Request.addField(el.name, el.options[el.selectedIndex].value); } break; - + case 'select-multiple': for (var j = 0; j < el.options.length; j++) { if (!el.options[j].selected) continue; Request.addField(el.name, el.options[j].value); } break; - + case 'checkbox': case 'radio': if (!el.checked) continue; @@ -218,7 +218,7 @@ window.location.href = $match_redirect[1]; return false; } - + if ($object.showProgress($responce)) { $object.Query(); } @@ -230,12 +230,12 @@ AjaxProgressBar.prototype.FormatTime = function ($seconds) { $seconds = parseInt($seconds); - + var $minutes = Math.floor($seconds / 60); if ($minutes < 10) $minutes = '0' + $minutes; $seconds = $seconds % 60; if ($seconds < 10) $seconds = '0' + $seconds; - + return $minutes + ':' + $seconds; } @@ -244,13 +244,13 @@ var $now = this.GetMicroTime(); this.ProgressTime[this.ProgressTime.length] = $now - this.LastResponceTime; this.LastResponceTime = $now; - + var $display_progress = parseInt(this.ProgressPercent); this.GetWindow().document.title = $display_progress + '% - ' + this.WindowTitle; document.getElementById('progress_display[percents_completed]').innerHTML = $display_progress + '%'; document.getElementById('progress_display[elapsed_time]').innerHTML = this.FormatTime( Math.sum(this.ProgressTime) ); document.getElementById('progress_display[Estimated_time]').innerHTML = this.FormatTime( this.GetEstimatedTime() ); - + document.getElementById('progress_bar[done]').style.width = $display_progress + '%'; document.getElementById('progress_bar[left]').style.width = (100 - $display_progress) + '%'; return $percent < 100 ? true : false;