CVSROOT:        /cvs/cluster
Module name:    conga
Branch:         RHEL5
Changes by:     [email protected]  2009-01-26 18:15:52

Modified files:
        .              : conga.spec.in.in 
        luci/plone-custom: conga_ajax.js 
        luci/site/luci/var: Data.fs 

Log message:
        More fixes for MSIE <= 6

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.108&r2=1.45.2.109
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga_ajax.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.4&r2=1.2.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.38&r2=1.15.2.39

--- conga/conga.spec.in.in      2009/01/26 17:01:19     1.45.2.108
+++ conga/conga.spec.in.in      2009/01/26 18:15:11     1.45.2.109
@@ -327,6 +327,7 @@
 - Fix bz452704 (Unable to add existing RHEL4 clusters with RHEL5.2 Luci)
 - Fix bz467464 (adding qdisk to existing cluster fails to update cman entry in 
cluster.conf)
 - Fix bz460038 (Conga fs resource error when editing service)
+- Fix incompatibilities with MSIE 6 and lower.
 
 * Thu Sep 25 2008 Ryan McCabe <[email protected]> 0.12.1-7
 - Fix a typo in the fix for bz459562
--- conga/luci/plone-custom/conga_ajax.js       2009/01/26 17:01:21     1.2.2.4
+++ conga/luci/plone-custom/conga_ajax.js       2009/01/26 18:15:12     1.2.2.5
@@ -12,22 +12,22 @@
 function get_xmlhttp_obj() {
        xmlHttp_object = false;
 
-       if (!xmlHttp_object || typeof XMLHttpRequest != 'undefined') {
+       if (!xmlHttp_object) {
                try {
                        xmlHttp_object = new XMLHttpRequest();
-                       if (!xmlHttp_object || typeof XMLHttpRequest != 
'undefined') {
+                       if (!xmlHttp_object) {
                                throw "no XMLHttpRequest";
                        }
                } catch (e0) {
                        try {
                                xmlHttp_object = new 
ActiveXObject("Msxml2.XMLHTTP");
-                               if (!xmlHttp_object || typeof XMLHttpRequest != 
'undefined') {
+                               if (!xmlHttp_object) {
                                        throw "no Msxml2.XMLHTTP";
                                }
                        } catch (e) {
                                try {
                                        xmlHttp_object = new 
ActiveXObject("Microsoft.XMLHTTP");
-                                       if (!xmlHttp_object || typeof 
XMLHttpRequest != 'undefined') {
+                                       if (!xmlHttp_object) {
                                                throw "No Microsoft.XMLHTTP";
                                        }
                                } catch (e2) {
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs      2008/09/18 
15:19:36     1.15.2.38 and /cvs/cluster/conga/luci/site/luci/var/Data.fs     
2009/01/26 18:15:12     1.15.2.39 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed

Reply via email to