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

Attempt to simplify the fileattachmentannotation event dispatching

Browse Source 
This attempts to reduced the level of indirection, and the amount of code, when dispatching `fileattachmentannotation` events, by removing the `PDFLinkService.onFileAttachmentAnnotation` method and just accessing `PDFLinkService.eventBus` directly in the `FileAttachmentAnnotationElement` constructor.
Given that other properties, such as `externalLinkTarget`/`externalLinkRel`, are already being accessed directly this pattern seems fine here as well.
This commit is contained in:
Jonas Jenwald 2018-10-01 11:55:25 +02:00
parent ec10cae5b6
commit d60ce998f1
3 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/display/annotation_layer.js
View File

@ -1130,15 +1130,18 @@ class FileAttachmentAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
super(parameters, /* isRenderable = */ true); super(parameters, /* isRenderable = */ true);
let file = this.data.file; const { filename, content, } = this.data.file;
this.filename = getFilenameFromUrl(file.filename); this.filename = getFilenameFromUrl(filename);
this.content = file.content; this.content = content;
this.linkService.onFileAttachmentAnnotation({ if (this.linkService.eventBus) {
id: stringToPDFString(file.filename), this.linkService.eventBus.dispatch('fileattachmentannotation', {
filename: file.filename, source: this,
content: file.content, id: stringToPDFString(filename),
}); filename,
content,
});
}
} }
/** /**

5
web/interfaces.js
View File

@ -67,11 +67,6 @@ class IPDFLinkService {
*/ */
executeNamedAction(action) {} executeNamedAction(action) {}
/**
* @param {Object} params
*/
onFileAttachmentAnnotation({ id, filename, content, }) {}
/** /**
* @param {number} pageNum - page number. * @param {number} pageNum - page number.
* @param {Object} pageRef - reference to the page. * @param {Object} pageRef - reference to the page.

17
web/pdf_link_service.js
View File

@ -337,18 +337,6 @@ class PDFLinkService {
}); });
} }
/**
* @param {Object} params
*/
onFileAttachmentAnnotation({ id, filename, content, }) {
this.eventBus.dispatch('fileattachmentannotation', {
source: this,
id,
filename,
content,
});
}
/** /**
* @param {number} pageNum - page number. * @param {number} pageNum - page number.
* @param {Object} pageRef - reference to the page. * @param {Object} pageRef - reference to the page.
@ -481,11 +469,6 @@ class SimpleLinkService {
*/ */
executeNamedAction(action) {} executeNamedAction(action) {}
/**
* @param {Object} params
*/
onFileAttachmentAnnotation({ id, filename, content, }) {}
/** /**
* @param {number} pageNum - page number. * @param {number} pageNum - page number.
* @param {Object} pageRef - reference to the page. * @param {Object} pageRef - reference to the page.