Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Xavier Fung 2012-08-16 11:23:50 +08:00
commit 1cf3b489bb

View File

@ -244,9 +244,10 @@
}; };
})(); })();
// IE9 text/html data URI // IE9/10 text/html data URI
(function checkDocumentDocumentModeCompatibility() { (function checkDataURICompatibility() {
if (!('documentMode' in document) || document.documentMode !== 9) if (!('documentMode' in document) ||
document.documentMode !== 9 && document.documentMode !== 10)
return; return;
// overriding the src property // overriding the src property
var originalSrcDescriptor = Object.getOwnPropertyDescriptor( var originalSrcDescriptor = Object.getOwnPropertyDescriptor(