[js-embedded-discovery COMMIT] in /trunk: doc/RELEASE-NOTES.txt src/javascript/idpselect.js

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar 14 12:05:07 2012
New Revision: 101

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=101&view=rev
Log:
EDS-24, EDS-35  Accept supplied patch to fix javascript impaired IE installs

Modified:
    trunk/doc/RELEASE-NOTES.txt
    trunk/src/javascript/idpselect.js

Modified: trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/doc/RELEASE-NOTES.txt?rev=101&r1=100&r2=101&view=diff
==============================================================================
--- trunk/doc/RELEASE-NOTES.txt (original)
+++ trunk/doc/RELEASE-NOTES.txt Wed Mar 14 12:05:07 2012
@@ -1,4 +1,8 @@
-Chnages in V1.0.1
+Changes in V1.0.2
+=============================================
+EDS-24 The embedded discovery service will fail to work with Internet Explorer when native XHR is disabled
+
+Changes in V1.0.1
 =============================================
 EDS-20 Kitting error prevents incremental search from working.
 

Modified: trunk/src/javascript/idpselect.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect.js?rev=101&r1=100&r2=101&view=diff
==============================================================================
--- trunk/src/javascript/idpselect.js (original)
+++ trunk/src/javascript/idpselect.js Wed Mar 14 12:05:07 2012
@@ -366,6 +366,22 @@
             xhr = new XMLHttpRequest();
         } catch (e) {}
         if (null == xhr) {
+            //
+            // EDS24. try to get 'Microsoft.XMLHTTP'
+            //
+            try {
+                xhr = new ActiveXObject("Microsoft.XMLHTTP");
+            } catch (e) {}
+        }
+        if (null == xhr) {
+            //
+            // EDS35. try to get 'Microsoft.XMLHTTP'
+            //
+            try {
+                xhr = new  ActiveXObject('MSXML2.XMLHTTP.3.0');
+            } catch (e) {}
+        }
+        if (null == xhr) {
             fatal(getLocalizedMessage('fatal.noXMLHttpRequest'));
             return false;
         }