Skip to content

pat inject: Fix formaction button injections with target self. #809

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 9, 2021
Merged

pat inject: Fix formaction button injections with target self. #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@

### Fixes

- pat inject: Fix formaction button injections with target ``self``. Fixes: https://github.com/quaive/ploneintranet.prototype/issues/1164
- pat calendar: Fix language loading error "Error: Cannot find module './en.js'"
- pat depends, pat auto suggest: Fix a problem with initialization of ``pat-auto-suggest`` which occurred after the lazy loading changes.
- pat checklist: Also dispatch standard ``change`` event when de/selecting all items.
Expand Down
17 changes: 15 additions & 2 deletions src/pat/inject/inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@ const inject = {
const $button = $(e.target);
const formaction = $button.attr("formaction");
const $form = $button.parents(".pat-inject").first();
const opts = { url: formaction };
const opts = {
url: formaction,
$formaction_button: $button,
};
const $cfg_node = $button.closest("[data-pat-inject]");
const cfgs = this.extractConfig($cfg_node, opts);

Expand Down Expand Up @@ -239,6 +242,15 @@ const inject = {
$el.parents("form").attr("action") ||
"";

if (
opts.$formaction_button &&
(cfg.target || "").startsWith("self")
) {
// In case of button formaction submit with target ``self``,
// set it. Otherwise the ``form`` will be used as target.
cfg.$target = opts.$formaction_button;
}

// separate selector from url
const urlparts = cfg.url.split("#");
cfg.url = urlparts[0];
Expand Down Expand Up @@ -311,9 +323,10 @@ const inject = {
* cfg.$target.
*/
// make sure target exist
if (cfg.target === "none")
if (cfg.target === "none") {
// special case, we don't want to inject anything
return true;
}
cfg.$target =
cfg.$target || (cfg.target === "self" ? $el : $(cfg.target));
if (cfg.$target.length === 0) {
Expand Down
37 changes: 37 additions & 0 deletions src/pat/inject/inject.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,43 @@ describe("pat-inject", function () {
expect($target1.html()).toBe("some");
expect($target2.html()).toBe("other");
});

it("formaction which replaces itself", async (done) => {
answer(`
<html>
<body>
<div id="someid">some</div>
<div id="otherid">other</div>
</body>
</html>
`);

document.body.innerHTML = `
<div id="oha">form inject target</div>
<form
class="pat-inject"
data-pat-inject="target:#oha;source:#id1">
<button
type="submit"
formaction="test.cgi"
class="pat-inject"
data-pat-inject="target:self::element;source:#otherid"
/>
</form>
`;

pattern.init($("form"));
await utils.timeout(1); // wait a tick for async to settle.

document.querySelector("form button").click();
await utils.timeout(1); // wait a tick for async to settle.

expect(
document.querySelector("form").innerHTML.trim()
).toBe("other");

done();
});
});
});
});
Expand Down