Merge branch 'master' into prettify

yui · Oct 12, 2012 · 8887b1a · 8887b1a
2 parents 55699a4 + 626c957
commit 8887b1a
Show file tree

Hide file tree

Showing 184 changed files with 5,816 additions and 2,767 deletions.
diff --git a/build/dial/dial-coverage.js b/build/dial/dial-coverage.js
diff --git a/build/dial/dial-debug.js b/build/dial/dial-debug.js
diff --git a/build/dial/dial-min.js b/build/dial/dial-min.js
diff --git a/build/dial/dial.js b/build/dial/dial.js
diff --git a/build/io-base/io-base-coverage.js b/build/io-base/io-base-coverage.js
diff --git a/build/io-base/io-base-debug.js b/build/io-base/io-base-debug.js
@@ -115,9 +115,9 @@ IO.prototype = {
             use;
 
         if (alt === 'native') {
-            // Non-IE  can use XHR level 2 and not rely on an
+            // Non-IE and IE >= 10  can use XHR level 2 and not rely on an
             // external transport.
-            alt = Y.UA.ie ? 'xdr' : null;
+            alt = Y.UA.ie && !SUPPORTS_CORS ? 'xdr' : null;
 
             // Prevent "pre-flight" OPTIONS request by removing the
             // `X-Requested-With` HTTP header from CORS requests. This header
@@ -707,10 +707,8 @@ IO.prototype = {
 
             // Will work only in browsers that implement the
             // Cross-Origin Resource Sharing draft.
-            if (config.xdr && config.xdr.credentials) {
+            if (config.xdr && config.xdr.credentials && SUPPORTS_CORS) {
-                if (!Y.UA.ie) {
+                transaction.c.withCredentials = true;
-                    transaction.c.withCredentials = true;
-                }
             }
 
             // Using "null" with HTTP POST will result in a request
@@ -908,7 +906,11 @@ Y.IO = IO;
 Y.io._map = {};
 var XHR = win && win.XMLHttpRequest,
     XDR = win && win.XDomainRequest,
-    AX = win && win.ActiveXObject;
+    AX = win && win.ActiveXObject,
+
+    // Checks for the presence of the `withCredentials` in an XHR instance
+    // object, which will be present if the environment supports CORS.
+    SUPPORTS_CORS = XHR && 'withCredentials' in (new XMLHttpRequest());
 
 
 Y.mix(Y.IO, {

diff --git a/build/io-base/io-base-min.js b/build/io-base/io-base-min.js
diff --git a/build/io-base/io-base.js b/build/io-base/io-base.js
@@ -115,9 +115,9 @@ IO.prototype = {
             use;
 
         if (alt === 'native') {
-            // Non-IE  can use XHR level 2 and not rely on an
+            // Non-IE and IE >= 10  can use XHR level 2 and not rely on an
             // external transport.
-            alt = Y.UA.ie ? 'xdr' : null;
+            alt = Y.UA.ie && !SUPPORTS_CORS ? 'xdr' : null;
 
             // Prevent "pre-flight" OPTIONS request by removing the
             // `X-Requested-With` HTTP header from CORS requests. This header
@@ -706,10 +706,8 @@ IO.prototype = {
 
             // Will work only in browsers that implement the
             // Cross-Origin Resource Sharing draft.
-            if (config.xdr && config.xdr.credentials) {
+            if (config.xdr && config.xdr.credentials && SUPPORTS_CORS) {
-                if (!Y.UA.ie) {
+                transaction.c.withCredentials = true;
-                    transaction.c.withCredentials = true;
-                }
             }
 
             // Using "null" with HTTP POST will result in a request
@@ -906,7 +904,11 @@ Y.IO = IO;
 Y.io._map = {};
 var XHR = win && win.XMLHttpRequest,
     XDR = win && win.XDomainRequest,
-    AX = win && win.ActiveXObject;
+    AX = win && win.ActiveXObject,
+
+    // Checks for the presence of the `withCredentials` in an XHR instance
+    // object, which will be present if the environment supports CORS.
+    SUPPORTS_CORS = XHR && 'withCredentials' in (new XMLHttpRequest());
 
 
 Y.mix(Y.IO, {