Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js =================================================================== diff -u -r7099 -r7283 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 7099) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 7283) @@ -1,7 +1,20 @@ +function preg_print_pre(obj, reg) +{ + if (!reg) reg = /.*/; + var p = '' + for (var prop in obj) { + if (prop.match(reg) ) { + p += prop + ': '+obj[prop] + '\n' + } + } + alert(p) +} + + // Main AJAX classs function Request() {} -Request.timeout = 5000; //5 seconds +Request.timeout = 15000; //5 seconds Request.method = 'GET'; Request.headers = new Array(); Request.params = null; @@ -24,12 +37,18 @@ if (req.readyState == 4) { p_busyReq = false; window.clearTimeout(toId); - if (req.status == 200) { - p_successCallBack(req, p_pass, p_object); - } else { - p_errorCallBack(req, p_pass, p_object); + try { + if (req.status == 200) { + // preg_print_pre(req) + p_successCallBack(req, p_pass, p_object); + } else { + p_errorCallBack(req, p_pass, p_object); + } + Request.hideProgress(p_progId); } - Request.hideProgress(p_progId); + catch (e) { +// alert('AJAX error') + } } } var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes'; @@ -201,6 +220,7 @@ } AjaxProgressBar.prototype.Query = function() { +// prompt('requestinng', this.URL); Request.makeRequest(this.URL, this.BusyRequest, '', this.successCallback, this.errorCallback, '', this); }