Merge pull request #9473 from Snuffleupagus/DownloadManager-a-click

Remove the non-`a.click()` case from the `DownloadManager`
This commit is contained in:
Tim van der Meij 2018-02-12 22:16:48 +01:00 committed by GitHub
commit ea3d8450d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,38 +22,21 @@ if (typeof PDFJSDev !== 'undefined' && !PDFJSDev.test('CHROME || GENERIC')) {
function download(blobUrl, filename) { function download(blobUrl, filename) {
let a = document.createElement('a'); let a = document.createElement('a');
if (a.click) { if (!a.click) {
// Use a.click() if available. Otherwise, Chrome might show throw new Error('DownloadManager: "a.click()" is not supported.');
// "Unsafe JavaScript attempt to initiate a navigation change
// for frame with URL" and not open the PDF at all.
// Supported by (not mentioned = untested):
// - Firefox 6 - 19 (4- does not support a.click, 5 ignores a.click)
// - Chrome 19 - 26 (18- does not support a.click)
// - Opera 9 - 12.15
// - Internet Explorer 6 - 10
// - Safari 6 (5.1- does not support a.click)
a.href = blobUrl;
a.target = '_parent';
// Use a.download if available. This increases the likelihood that
// the file is downloaded instead of opened by another PDF plugin.
if ('download' in a) {
a.download = filename;
}
// <a> must be in the document for IE and recent Firefox versions.
// (otherwise .click() is ignored)
(document.body || document.documentElement).appendChild(a);
a.click();
a.remove();
} else {
if (window.top === window &&
blobUrl.split('#')[0] === window.location.href.split('#')[0]) {
// If _parent == self, then opening an identical URL with different
// location hash will only cause a navigation, not a download.
let padCharacter = blobUrl.includes('?') ? '&' : '?';
blobUrl = blobUrl.replace(/#|$/, padCharacter + '$&');
}
window.open(blobUrl, '_parent');
} }
a.href = blobUrl;
a.target = '_parent';
// Use a.download if available. This increases the likelihood that
// the file is downloaded instead of opened by another PDF plugin.
if ('download' in a) {
a.download = filename;
}
// <a> must be in the document for IE and recent Firefox versions,
// otherwise .click() is ignored.
(document.body || document.documentElement).appendChild(a);
a.click();
a.remove();
} }
class DownloadManager { class DownloadManager {