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

Merge pull request #13801 from Snuffleupagus/AnnotationLayer-check-navigator

Browse Source 
Access `navigator` safely in the `src/display/annotation_layer.js` file
This commit is contained in:
Tim van der Meij 2021-07-27 22:10:27 +02:00 committed by GitHub
commit e51cbe63bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/display/annotation_layer.js
View File

@ -24,6 +24,7 @@ import {
AnnotationBorderStyleType, AnnotationBorderStyleType,
AnnotationType, AnnotationType,
assert, assert,
shadow,
stringToPDFString, stringToPDFString,
unreachable, unreachable,
Util, Util,
@ -359,6 +360,15 @@ class AnnotationElement {
render() { render() {
unreachable("Abstract method `AnnotationElement.render` called"); unreachable("Abstract method `AnnotationElement.render` called");
} }
static get platform() {
const platform = typeof navigator !== "undefined" ? navigator.platform : "";
return shadow(this, "platform", {
isWin: platform.includes("Win"),
isMac: platform.includes("Mac"),
});
}
} }
class LinkAnnotationElement extends AnnotationElement { class LinkAnnotationElement extends AnnotationElement {
@ -539,10 +549,8 @@ class WidgetAnnotationElement extends AnnotationElement {
} }
_getKeyModifier(event) { _getKeyModifier(event) {
return ( const { isWin, isMac } = AnnotationElement.platform;
(navigator.platform.includes("Win") && event.ctrlKey) || return (isWin && event.ctrlKey) || (isMac && event.metaKey);
(navigator.platform.includes("Mac") && event.metaKey)
);
} }
_setEventListener(element, baseName, eventName, valueGetter) { _setEventListener(element, baseName, eventName, valueGetter) {