Merge remote branch 'upstream/master'

This commit is contained in:
Vivien Nicolas 2011-09-22 00:45:12 +02:00
commit bfd5487e81

View File

@ -110,15 +110,15 @@ var PDFView = {
var xhr = new XMLHttpRequest();
xhr.open('GET', url);
xhr.mozResponseType = xhr.responseType = 'arraybuffer';
xhr.expected = (document.URL.indexOf('file:') === 0) ? 0 : 200;
xhr.expected = (document.URL.indexOf('file:') === 0) ? 0 : 200;
xhr.onprogress = PDFView.progressLevel;
xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === xhr.expected) {
var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
xhr.responseArrayBuffer || xhr.response);
document.getElementById('loading').style.display = "none";
document.getElementById('loading').style.display = 'none';
PDFView.load(data, scale);
}
};