Index: trunk/kernel/admin_templates/incs/ajax.js
===================================================================
diff -u -r5042 -r5062
--- trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5042)
+++ trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5062)
@@ -2,6 +2,7 @@
Request.timeout = 5000; //5 seconds
Request.method = 'GET';
+Request.contentType = '';
Request.params = null;
Request.makeRequest = function(p_url, p_busyReq, p_progId, p_successCallBack, p_errorCallBack, p_pass) {
@@ -39,7 +40,14 @@
}
else {
req.setRequestHeader('If-Modified-Since', 'Sat, 1 Jan 2000 00:00:00 GMT');
- req.send(null);
+ if (Request.contentType) {
+ req.setRequestHeader('Content-type', Request.contentType);
+ req.send(null);
+ Request.contentType = '';
+ }
+ else {
+ req.send(null);
+ }
}
var toId = window.setTimeout( function() {if (p_busyReq) req.abort();}, Request.timeout );
Index: trunk/kernel/admin_templates/incs/tree.js
===================================================================
diff -u -r5002 -r5062
--- trunk/kernel/admin_templates/incs/tree.js (.../tree.js) (revision 5002)
+++ trunk/kernel/admin_templates/incs/tree.js (.../tree.js) (revision 5062)
@@ -326,28 +326,8 @@
TreeFolder.prototype.folderClick = function(img)
{
if (this.LateLoadURL && !this.Loaded) {
-
- request = getXMLHTTPObject('text/xml');
-
- if (request && request.readyState != 0) {
- request.abort();
- }
- request.open('POST', this.LateLoadURL, true);
- request.setRequestHeader("referer", this.LateLoadURL);
- obj = this;
- function processLateLoad() {
- if (request.readyState == 4) {
- if (request.status == 200) {
- obj.ProcessXMLNode(request.responseXML);
- obj.Loaded = true;
- obj.Render();
- obj.locateTopItem().updateLastNodes();
- obj.expand();
- }
- }
- }
- request.onreadystatechange = processLateLoad;
- request.send('is_xml=1');
+ Request.contentType = 'text/xml';
+ Request.makeRequest(this.LateLoadURL, false, '', this.successCallback, this.errorCallback, this);
}
if (this.Expanded) {
@@ -358,6 +338,18 @@
}
}
+TreeFolder.prototype.successCallback = function ($request, $object) {
+ $object.ProcessXMLNode($request.responseXML);
+ $object.Loaded = true;
+ $object.Render();
+ $object.locateTopItem().updateLastNodes();
+ $object.expand();
+}
+
+TreeFolder.prototype.errorCallback = function($request, $params) {
+ alert('AJAX ERROR: ' + Request.getErrorHtml($request));
+}
+
TreeFolder.prototype.expand = function(mode)
{
if (!isset(mode)) mode = 0;
Index: trunk/kernel/admin_templates/tree.tpl
===================================================================
diff -u -r5002 -r5062
--- trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 5002)
+++ trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 5062)
@@ -15,6 +15,7 @@
}
+