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

Fix WidgetAnnotationElement._getKeyModifier to account for Linux

Browse Source 
Currently the `WidgetAnnotationElement._getKeyModifier` method will always be falsy on Linux, which seems like a simple oversight. Looking at all the other `FeatureTest.platform` accesses we only handle the `isMac`-case specially, and it seems reasonable to do the same thing here.
The reason that this hasn't led to any bug reports is most likely that the `modifier`-property seems completely unused in the scripting-implementation.

Finally, with these changes we can (slightly) simplify the `FeatureTest.platform` implementation.
This commit is contained in:
Jonas Jenwald 2023-10-26 13:36:42 +02:00
parent fbfacf8828
commit 069096e78f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/display/annotation_layer.js
View File

@ -1018,8 +1018,7 @@ class WidgetAnnotationElement extends AnnotationElement {
} }
_getKeyModifier(event) { _getKeyModifier(event) {
const { isWin, isMac } = FeatureTest.platform; return FeatureTest.platform.isMac ? event.metaKey : event.ctrlKey;
return (isWin && event.ctrlKey) || (isMac && event.metaKey);
} }
_setEventListener(element, elementData, baseName, eventName, valueGetter) { _setEventListener(element, elementData, baseName, eventName, valueGetter) {

3
src/shared/util.js
View File

@ -619,10 +619,9 @@ class FeatureTest {
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
typeof navigator === "undefined" typeof navigator === "undefined"
) { ) {
return shadow(this, "platform", { isWin: false, isMac: false }); return shadow(this, "platform", { isMac: false });
} }
return shadow(this, "platform", { return shadow(this, "platform", {
isWin: navigator.platform.includes("Win"),
isMac: navigator.platform.includes("Mac"), isMac: navigator.platform.includes("Mac"),
}); });
} }