Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pat inject fixes #1189

Merged
merged 4 commits into from
Nov 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/core/events.js
Original file line number Diff line number Diff line change
@@ -237,11 +237,13 @@ const scroll_event = () => {
});
};

const submit_event = () => {
return new Event("submit", {
const submit_event = ({ submitter } = { submitter: undefined }) => {
const event = new Event("submit", {
bubbles: true,
cancelable: true,
});
event.submitter = submitter; // undefined or the submitting element
return event;
};

const dragstart_event = () => {
17 changes: 16 additions & 1 deletion src/core/events.test.js
Original file line number Diff line number Diff line change
@@ -546,12 +546,27 @@ describe("core.events tests", () => {
});

it("submit event", async () => {
outer.addEventListener("submit", () => {
let submitter = "not defined";
outer.addEventListener("submit", (e) => {
catched = "outer";
submitter = e.submitter;
});
inner.dispatchEvent(events.submit_event());
await utils.timeout(1);
expect(catched).toBe("outer");
expect(submitter).toBe(undefined);
});

it("submit event with defined submitter", async () => {
let submitter = "not defined";
outer.addEventListener("submit", (e) => {
catched = "outer";
submitter = e.submitter;
});
inner.dispatchEvent(events.submit_event({ submitter: inner }));
await utils.timeout(1);
expect(catched).toBe("outer");
expect(submitter).toBe(inner);
});

it("dragstart event", async () => {
14 changes: 7 additions & 7 deletions src/lib/input-change-events.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// helper functions to make all input elements
import $ from "jquery";
import logging from "../core/logging";
var namespace = "input-change-events";
const namespace = "input-change-events";
const log = logging.getLogger(namespace);

var _ = {
const _ = {
setup: function ($el, pat) {
if (!pat) {
log.error("The name of the calling pattern has to be set.");
return;
}
// list of patterns that installed input-change-event handlers
var patterns = $el.data(namespace) || [];
const patterns = $el.data(namespace) || [];
log.debug("setup handlers for " + pat);

if (!patterns.length) {
@@ -42,9 +42,9 @@ var _ = {
},

registerHandlersForElement: function () {
var $el = $(this),
isNumber = $el.is("input[type=number]"),
isText = $el.is("input:text, input[type=search], textarea");
const $el = $(this);
const isNumber = $el.is("input[type=number]");
const isText = $el.is("input:text, input[type=search], textarea");

if (isNumber) {
// for <input type="number" /> we want to trigger the change
@@ -74,7 +74,7 @@ var _ = {
},

remove: function ($el, pat) {
var patterns = $el.data(namespace) || [];
let patterns = $el.data(namespace) || [];
if (patterns.indexOf(pat) === -1) {
log.warn("input-change-events were never installed for " + pat);
} else {
4 changes: 2 additions & 2 deletions src/pat/auto-submit/auto-submit.js
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ export default Base.extend({

// get all subforms whice are not yet auto submit forms.
const subforms = el.querySelectorAll(
".pat-autosubmit:not(.pat-autosubmit):not(.pat-auto-submit)"
".pat-subform:not(.pat-autosubmit):not(.pat-auto-submit)"
);
for (const subform of subforms) {
// register autosubmit on subform
@@ -128,7 +128,7 @@ export default Base.extend({

onInputChange(e) {
e.stopPropagation();
this.el.dispatchEvent(events.submit_event());
this.el.dispatchEvent(events.submit_event({ submitter: e.target }));
log.debug("triggered by " + e.type);
},
});
4 changes: 3 additions & 1 deletion src/pat/inject/inject.test.js
Original file line number Diff line number Diff line change
@@ -1110,7 +1110,9 @@ describe("pat-inject", function () {
// Work around jsDOM not submitting with image buttons.
$submit[0].addEventListener("click", async () => {
await utils.timeout(1); // wait a tick for click event reaching form before submitting.
$submit[0].form.dispatchEvent(events.submit_event());
$submit[0].form.dispatchEvent(
events.submit_event({ submitter: $submit[0] })
);
});

$submit[0].click();