From be2380fb47b05a222ec5b22deff36d5156a8c943 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 13:08:41 -0500
Subject: [PATCH] Added labels for LDAP search
---
program/js/app.js | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 650dbaa..ad91e1f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -232,8 +232,10 @@
this.display_message(this.pending_message[0], this.pending_message[1]);
// start interval for keep-alive/recent_check signal
- if (this.kepp_alive_interval)
- this.kepp_alive_int = setInterval(this.ref+'.'+(this.task=='mail'?'check_for_recent()':'send_keep_alive()'), this.kepp_alive_interval);
+ if (this.kepp_alive_interval && this.task=='mail' && this.gui_objects.messagelist)
+ this.kepp_alive_int = setInterval(this.ref+'.check_for_recent()', this.kepp_alive_interval);
+ else
+ this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval);
};
@@ -2708,8 +2710,8 @@
console(request_obj.responseText);
// if we get javascript code from server -> execute it
- if (request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript'))
- eval(request_obj.responseText);
+ if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript'))
+ eval(request_obj.get_text());
// process the response data according to the sent action
switch (request_obj.__action)
@@ -2966,9 +2968,6 @@
else if(this.xmlhttp.readyState == 4)
{
- this.responseText = this.xmlhttp.responseText;
- this.responseXML = this.xmlhttp.responseXML;
-
if(this.xmlhttp.status == 0)
this.onabort(this);
else if(this.xmlhttp.status == 200)
@@ -2986,6 +2985,15 @@
return this.xmlhttp.getResponseHeader(name);
};
+ this.get_text = function()
+ {
+ return this.xmlhttp.responseText;
+ };
+
+ this.get_xml = function()
+ {
+ return this.xmlhttp.responseXML;
+ };
this.reset();
--
Gitblit v1.9.1