Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2635 from brendandahl/content-disposition-filename

Browse Source 
Use attachment content disposition attachment and filename.
This commit is contained in:
Yury Delendik 2013-01-30 15:40:23 -08:00
commit cea46c4e51
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/firefox/components/PdfStreamConverter.js
View File

@ -201,9 +201,10 @@ PdfDataListener.prototype = {
}; };
// All the priviledged actions. // All the priviledged actions.
function ChromeActions(domWindow, dataListener) { function ChromeActions(domWindow, dataListener, contentDispositionFilename) {
this.domWindow = domWindow; this.domWindow = domWindow;
this.dataListener = dataListener; this.dataListener = dataListener;
this.contentDispositionFilename = contentDispositionFilename;
} }
ChromeActions.prototype = { ChromeActions.prototype = {
@ -232,6 +233,7 @@ ChromeActions.prototype = {
return docIsPrivate; return docIsPrivate;
}, },
download: function(data, sendResponse) { download: function(data, sendResponse) {
var self = this;
var originalUrl = data.originalUrl; var originalUrl = data.originalUrl;
// The data may not be downloaded so we need just retry getting the pdf with // The data may not be downloaded so we need just retry getting the pdf with
// the original url. // the original url.
@ -259,9 +261,13 @@ ChromeActions.prototype = {
// so the filename will be correct. // so the filename will be correct.
let channel = Cc['@mozilla.org/network/input-stream-channel;1']. let channel = Cc['@mozilla.org/network/input-stream-channel;1'].
createInstance(Ci.nsIInputStreamChannel); createInstance(Ci.nsIInputStreamChannel);
channel.QueryInterface(Ci.nsIChannel);
channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
if (self.contentDispositionFilename) {
channel.contentDispositionFilename = self.contentDispositionFilename;
}
channel.setURI(originalUri); channel.setURI(originalUri);
channel.contentStream = aInputStream; channel.contentStream = aInputStream;
channel.QueryInterface(Ci.nsIChannel);
if ('nsIPrivateBrowsingChannel' in Ci && if ('nsIPrivateBrowsingChannel' in Ci &&
channel instanceof Ci.nsIPrivateBrowsingChannel) { channel instanceof Ci.nsIPrivateBrowsingChannel) {
channel.setPrivate(docIsPrivate); channel.setPrivate(docIsPrivate);
@ -583,6 +589,10 @@ PdfStreamConverter.prototype = {
// Creating storage for PDF data // Creating storage for PDF data
var contentLength = aRequest.contentLength; var contentLength = aRequest.contentLength;
var dataListener = new PdfDataListener(contentLength); var dataListener = new PdfDataListener(contentLength);
var contentDispositionFilename;
try {
contentDispositionFilename = aRequest.contentDispositionFilename;
} catch (e) {}
this.dataListener = dataListener; this.dataListener = dataListener;
this.binaryStream = Cc['@mozilla.org/binaryinputstream;1'] this.binaryStream = Cc['@mozilla.org/binaryinputstream;1']
.createInstance(Ci.nsIBinaryInputStream); .createInstance(Ci.nsIBinaryInputStream);
@ -613,7 +623,8 @@ PdfStreamConverter.prototype = {
var domWindow = getDOMWindow(channel); var domWindow = getDOMWindow(channel);
// Double check the url is still the correct one. // Double check the url is still the correct one.
if (domWindow.document.documentURIObject.equals(aRequest.URI)) { if (domWindow.document.documentURIObject.equals(aRequest.URI)) {
let actions = new ChromeActions(domWindow, dataListener); let actions = new ChromeActions(domWindow, dataListener,
contentDispositionFilename);
let requestListener = new RequestListener(actions); let requestListener = new RequestListener(actions);
domWindow.addEventListener(PDFJS_EVENT_ID, function(event) { domWindow.addEventListener(PDFJS_EVENT_ID, function(event) {
requestListener.receive(event); requestListener.receive(event);