parent
7102e4a5c3
commit
34d2e72df2
@ -370,8 +370,8 @@ class LinkAnnotationElement extends AnnotationElement {
|
||||
parameters.data.isTooltipOnly ||
|
||||
(parameters.data.actions &&
|
||||
(parameters.data.actions.Action ||
|
||||
parameters.data.actions.MouseUp ||
|
||||
parameters.data.actions.MouseDown))
|
||||
parameters.data.actions["Mouse Up"] ||
|
||||
parameters.data.actions["Mouse Down"]))
|
||||
);
|
||||
super(parameters, { isRenderable, createQuadrilaterals: true });
|
||||
}
|
||||
@ -395,7 +395,9 @@ class LinkAnnotationElement extends AnnotationElement {
|
||||
this._bindLink(link, data.dest);
|
||||
} else if (
|
||||
data.actions &&
|
||||
(data.actions.Action || data.actions.MouseUp || data.actions.MouseDown) &&
|
||||
(data.actions.Action ||
|
||||
data.actions["Mouse Up"] ||
|
||||
data.actions["Mouse Down"]) &&
|
||||
this.enableScripting &&
|
||||
this.hasJSActions
|
||||
) {
|
||||
@ -469,8 +471,8 @@ class LinkAnnotationElement extends AnnotationElement {
|
||||
link.href = this.linkService.getAnchorUrl("");
|
||||
const map = new Map([
|
||||
["Action", "onclick"],
|
||||
["MouseUp", "onmouseup"],
|
||||
["MouseDown", "onmousedown"],
|
||||
["Mouse Up", "onmouseup"],
|
||||
["Mouse Down", "onmousedown"],
|
||||
]);
|
||||
for (const name of Object.keys(data.actions)) {
|
||||
const jsName = map.get(name);
|
||||
@ -575,11 +577,7 @@ class WidgetAnnotationElement extends AnnotationElement {
|
||||
|
||||
_setEventListeners(element, names, getter) {
|
||||
for (const [baseName, eventName] of names) {
|
||||
if (
|
||||
eventName === "Action" ||
|
||||
(this.data.actions &&
|
||||
this.data.actions[eventName.replace(" ", "")] !== undefined)
|
||||
) {
|
||||
if (eventName === "Action" || this.data.actions?.[eventName]) {
|
||||
this._setEventListener(element, baseName, eventName, getter);
|
||||
}
|
||||
}
|
||||
@ -803,7 +801,7 @@ class TextWidgetAnnotationElement extends WidgetAnnotationElement {
|
||||
["mousedown", "Mouse Down"],
|
||||
["mouseenter", "Mouse Enter"],
|
||||
["mouseleave", "Mouse Exit"],
|
||||
["mouseup", "MouseUp"],
|
||||
["mouseup", "Mouse Up"],
|
||||
],
|
||||
event => event.target.value
|
||||
);
|
||||
@ -942,7 +940,7 @@ class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
|
||||
["mousedown", "Mouse Down"],
|
||||
["mouseenter", "Mouse Enter"],
|
||||
["mouseleave", "Mouse Exit"],
|
||||
["mouseup", "MouseUp"],
|
||||
["mouseup", "Mouse Up"],
|
||||
],
|
||||
event => event.target.checked
|
||||
);
|
||||
@ -1031,7 +1029,7 @@ class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
|
||||
["mousedown", "Mouse Down"],
|
||||
["mouseenter", "Mouse Enter"],
|
||||
["mouseleave", "Mouse Exit"],
|
||||
["mouseup", "MouseUp"],
|
||||
["mouseup", "Mouse Up"],
|
||||
],
|
||||
event => event.target.checked
|
||||
);
|
||||
@ -1165,7 +1163,7 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
|
||||
["mousedown", "Mouse Down"],
|
||||
["mouseenter", "Mouse Enter"],
|
||||
["mouseleave", "Mouse Exit"],
|
||||
["mouseup", "MouseUp"],
|
||||
["mouseup", "Mouse Up"],
|
||||
],
|
||||
event => event.target.checked
|
||||
);
|
||||
|
@ -83,7 +83,7 @@ class EventDispatcher {
|
||||
return;
|
||||
}
|
||||
|
||||
const name = baseEvent.name.replace(" ", "");
|
||||
const name = baseEvent.name;
|
||||
const source = this._objects[id];
|
||||
const event = (globalThis.event = new Event(baseEvent));
|
||||
let savedChange;
|
||||
|
@ -145,10 +145,10 @@ const AnnotationBorderStyleType = {
|
||||
};
|
||||
|
||||
const AnnotationActionEventType = {
|
||||
E: "MouseEnter",
|
||||
X: "MouseExit",
|
||||
D: "MouseDown",
|
||||
U: "MouseUp",
|
||||
E: "Mouse Enter",
|
||||
X: "Mouse Exit",
|
||||
D: "Mouse Down",
|
||||
U: "Mouse Up",
|
||||
Fo: "Focus",
|
||||
Bl: "Blur",
|
||||
PO: "PageOpen",
|
||||
|
@ -2238,15 +2238,15 @@ describe("annotation", function () {
|
||||
})
|
||||
.then(object => {
|
||||
const actions = object.actions;
|
||||
expect(actions.MouseEnter).toEqual(["hello()"]);
|
||||
expect(actions.MouseExit).toEqual([
|
||||
expect(actions["Mouse Enter"]).toEqual(["hello()"]);
|
||||
expect(actions["Mouse Exit"]).toEqual([
|
||||
"world()",
|
||||
"olleh()",
|
||||
"foo()",
|
||||
"dlrow()",
|
||||
"oof()",
|
||||
]);
|
||||
expect(actions.MouseDown).toEqual(["bar()"]);
|
||||
expect(actions["Mouse Down"]).toEqual(["bar()"]);
|
||||
done();
|
||||
}, done.fail);
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user