Support file save triggered from the Firefox integrated version. #12248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Snuffleupagus
approved these changes
Aug 20, 2020
web/app.js
Outdated
| @@ -874,7 +874,7 @@ const PDFViewerApplication = { | |||
| ); | |||
| }, | |||
|
|
|||
| download() { | |||
| download(isFallback) { | |||
There was a problem hiding this comment.
Please change this to the following, to clearly mark the parameter as optional:
Suggested change
| download(isFallback) { | |
| download(isFallback = false) { |
web/download_manager.js
Outdated
| * from the fallback bar. The version of PDF.js integrated with Firefox uses | ||
| * this to to determine whether to show the "save as" or "open with" dialog. | ||
| */ | ||
| download(blob, url, filename, isFallback) { |
There was a problem hiding this comment.
Please change this to the following, to clearly mark the parameter as optional:
Suggested change
| download(blob, url, filename, isFallback) { | |
| download(blob, url, filename, isFallback = false) { |
web/firefoxcom.js
Outdated
| @@ -115,7 +115,7 @@ class DownloadManager { | |||
| ); | |||
| } | |||
|
|
|||
| download(blob, url, filename) { | |||
| download(blob, url, filename, isFallback) { | |||
There was a problem hiding this comment.
Please change this to the following, to clearly mark the parameter as optional:
Suggested change
| download(blob, url, filename, isFallback) { | |
| download(blob, url, filename, isFallback = false) { |
web/app.js
Outdated
| @@ -988,7 +988,7 @@ const PDFViewerApplication = { | |||
| if (!download) { | |||
| return; | |||
| } | |||
| PDFViewerApplication.download(); | |||
| PDFViewerApplication.download(true /* isFallback */); | |||
There was a problem hiding this comment.
Nit: In the code-base, this is usually formatted the following way.
Suggested change
| PDFViewerApplication.download(true /* isFallback */); | |
| PDFViewerApplication.download(/* isFallback = */ true); |
src/display/api.js
Outdated
| @@ -2540,7 +2540,7 @@ class WorkerTransport { | |||
| numPages: this._numPages, | |||
| annotationStorage: | |||
| (annotationStorage && annotationStorage.getAll()) || null, | |||
| filename: this._fullReader.filename, | |||
| filename: this._fullReader ? this._fullReader.filename : null, | |||
|
This is still a bit WIP, will update in a bit here once we decide how things should work in the bugzilla bug. |
brendandahl
force-pushed
the
pdf-save-as
branch
from
53db555 to
6b69478
Compare
brendandahl
commented
Aug 20, 2020
| @@ -2334,16 +2335,22 @@ function webViewerPresentationMode() { | |||
| function webViewerPrint() { | |||
| window.print(); | |||
| } | |||
| function webViewerDownload() { | |||
| function webViewerDownloadOrSave(sourceEventType) { | |||
There was a problem hiding this comment.
I don't like that this handles either calling save or download. I think the PDFViewerApplication method should do that, but let's fix that in a follow up.
| @@ -1722,6 +1722,7 @@ const PDFViewerApplication = { | |||
| eventBus._on("presentationmode", webViewerPresentationMode); | |||
| eventBus._on("print", webViewerPrint); | |||
| eventBus._on("download", webViewerDownload); | |||
| eventBus._on("save", webViewerSave); | |||
There was a problem hiding this comment.
This requires a corresponding eventBus._off(...) line in PDFViewerApplication.unbindEvents below.
brendandahl
force-pushed
the
pdf-save-as
branch
from
6b69478 to
1a5c49b
Compare
Related to https://bugzilla.mozilla.org/show_bug.cgi?id=1659753 This allows Firefox trigger a "save" event from ctrl/cmd+s or the "Save Page As" context menu, which in turn lets pdf.js generate a new PDF if there is form data to save. I also now use `sourceEventType` on downloads so Firefox can determine if it should launch the "open with" dialog or "save as" dialog.
brendandahl
force-pushed
the
pdf-save-as
branch
from
1a5c49b to
8023175
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to https://bugzilla.mozilla.org/show_bug.cgi?id=1659753
This allows Firefox trigger a "download" event from ctrl/cmd+s or the "Save
Page As" context menu, which in turn lets pdf.js generate a new PDF if
there is form data to save.
I also now set an
isFallbackflag on downloads triggered from thefallback bar so Firefox can keep launching the "open with" dialog instead
of the "save as" dialog.