Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/ext/hx-prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
let answer = (window.htmxPrompt || window.prompt)(question);
if (answer === null) return false;
if (!htmx.trigger(ctx.sourceElement, 'htmx:prompt', { prompt: answer, target: ctx.target })) return false;
ctx.request.headers['HX-Prompt'] = answer;
ctx.request.headers['HX-Prompt'] = encodeURI(answer);
}
});
})();
28 changes: 25 additions & 3 deletions test/tests/ext/hx-prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,28 @@ describe('hx-prompt extension', function() {
assert.equal(lastFetch().request.headers['HX-Prompt'], 'because');
});

it('URI-encodes unicode prompt responses for fetch headers', async function() {
window.prompt = () => '中文 reason';

let fetchCalled = false;
let encodedHeader;
let btn = createProcessedHTML('<button hx-delete="/items/1" hx-prompt="Reason for deletion?">Delete</button>');
btn.addEventListener('htmx:before:request', (e) => {
e.detail.ctx.fetch = async (action, request) => {
fetchCalled = true;
encodedHeader = request.headers['HX-Prompt'];
new Request(new URL(action, location.href), request);
return new Response('ok');
};
});

btn.click();
await forRequest();

assert.isTrue(fetchCalled);
assert.equal(encodedHeader, encodeURI('中文 reason'));
});

it('aborts the request when the user cancels', async function() {
window.prompt = () => null;
mockResponse('DELETE', '/items/1', 'ok');
Expand Down Expand Up @@ -105,7 +127,7 @@ describe('hx-prompt extension', function() {
btn.click();
await forRequest();

assert.equal(lastFetch().request.headers['HX-Prompt'], 'a reason');
assert.equal(lastFetch().request.headers['HX-Prompt'], 'a%20reason');
window.confirm = originalConfirm;
});

Expand Down Expand Up @@ -155,7 +177,7 @@ describe('hx-prompt extension', function() {
window.prompt = () => 'long enough';
btn.click();
await forRequest();
assert.equal(lastFetch().request.headers['HX-Prompt'], 'long enough');
assert.equal(lastFetch().request.headers['HX-Prompt'], 'long%20enough');
});

it('uses window.htmxPrompt when defined', async function() {
Expand All @@ -167,7 +189,7 @@ describe('hx-prompt extension', function() {
btn.click();
await forRequest();

assert.equal(lastFetch().request.headers['HX-Prompt'], 'answered: Q?');
assert.equal(lastFetch().request.headers['HX-Prompt'], 'answered:%20Q?');
});

it('null from window.htmxPrompt aborts the request', async function() {
Expand Down