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.

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

Jump to bottom

Remove implicit brace wrapping for hx-vals #2888

Closed
wants to merge 2 commits into from
Closed

Remove implicit brace wrapping for hx-vals #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3391d92
Accept arbitrary js expression in `hx-vals`
shouya Sep 9, 2024
d0bc56f
Update tests
shouya Sep 9, 2024
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
3 changes: 0 additions & 3 deletions src/htmx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,9 +3738,6 @@ var htmx = (function() {
str = str.substr(3)
evaluateValue = true
}
if (str.indexOf('{') !== 0) {
str = '{' + str + '}'
}
let varsValues
if (evaluateValue) {
varsValues = maybeEval(elt, function() { return Function('return (' + str + ')')() }, {})
Expand Down
57 changes: 14 additions & 43 deletions test/attributes/hx-vals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ describe('hx-vals attribute', function() {
})

it('basic hx-vals works', function() {
this.server.respondWith('POST', '/vars', function(xhr) {
var params = getParameters(xhr)
params.i1.should.equal('test')
xhr.respond(200, {}, 'Clicked!')
})
var div = make("<div hx-post='/vars' hx-vals='\"i1\":\"test\"'></div>")
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
})

it('basic hx-vals works with braces', function() {
this.server.respondWith('POST', '/vars', function(xhr) {
var params = getParameters(xhr)
params.i1.should.equal('test')
Expand All @@ -39,7 +27,7 @@ describe('hx-vals attribute', function() {
params.v2.should.equal('42')
xhr.respond(200, {}, 'Clicked!')
})
var div = make("<div hx-post='/vars' hx-vals='\"v1\":\"test\", \"v2\":42'></div>")
var div = make("<div hx-post='/vars' hx-vals='{\"v1\":\"test\", \"v2\":42}'></div>")
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
Expand All @@ -51,7 +39,7 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('test')
xhr.respond(200, {}, 'Clicked!')
})
make("<div hx-vals='\"i1\":\"test\"'><div id='d1' hx-post='/vars'></div></div>")
make("<div hx-vals='{\"i1\":\"test\"}'><div id='d1' hx-post='/vars'></div></div>")
var div = byId('d1')
div.click()
this.server.respond()
Expand All @@ -64,7 +52,7 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('best')
xhr.respond(200, {}, 'Clicked!')
})
make("<div hx-vals='\"i1\":\"test\"'><div id='d1' hx-vals='\"i1\":\"best\"' hx-post='/vars'></div></div>")
make("<div hx-vals='{\"i1\":\"test\"}'><div id='d1' hx-vals='{\"i1\":\"best\"}' hx-post='/vars'></div></div>")
var div = byId('d1')
div.click()
this.server.respond()
Expand All @@ -77,7 +65,7 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('best')
xhr.respond(200, {}, 'Clicked!')
})
var div = make("<div hx-target='this'><input hx-post='/include' hx-vals='\"i1\":\"best\"' hx-trigger='click' id='i1' name='i1' value='test'/></div>")
var div = make("<div hx-target='this'><input hx-post='/include' hx-vals='{\"i1\":\"best\"}' hx-trigger='click' id='i1' name='i1' value='test'/></div>")
var input = byId('i1')
input.click()
this.server.respond()
Expand All @@ -90,7 +78,7 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('test')
xhr.respond(200, {}, 'Clicked!')
})
var div = make("<div hx-post='/vars' hx-vals='\"i1\":\"test\"' hx-vars='\"i1\":\"best\"'></div>")
var div = make("<div hx-post='/vars' hx-vals='{\"i1\":\"test\"}' hx-vars='{\"i1\":\"best\"}'></div>")
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
Expand All @@ -102,19 +90,19 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('test')
xhr.respond(200, {}, 'Clicked!')
})
var div = make('<div hx-post="/vars" hx-vals="javascript:i1:\'test\'"></div>')
var div = make('<div hx-post="/vars" hx-vals="javascript:{i1:\'test\'}"></div>')
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
})

it('hx-vals works with braces', function() {
it('basic hx-vals javascript on dynamic keys: works', function() {
this.server.respondWith('POST', '/vars', function(xhr) {
var params = getParameters(xhr)
params.i1.should.equal('test')
xhr.respond(200, {}, 'Clicked!')
})
var div = make('<div hx-post="/vars" hx-vals="javascript:{i1:\'test\'}"></div>')
var div = make('<div hx-post="/vars" hx-vals="javascript:Object.fromEntries([[\'i1\',\'test\']])"></div>')
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
Expand Down Expand Up @@ -165,7 +153,7 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('best')
xhr.respond(200, {}, 'Clicked!')
})
var div = make('<div hx-target="this"><input hx-post="/include" hx-vals="javascript:i1:\'best\'" hx-trigger="click" id="i1" name="i1" value="test"/></div>')
var div = make('<div hx-target="this"><input hx-post="/include" hx-vals="javascript:{i1:\'best\'}" hx-trigger="click" id="i1" name="i1" value="test"/></div>')
var input = byId('i1')
input.click()
this.server.respond()
Expand All @@ -178,30 +166,13 @@ describe('hx-vals attribute', function() {
params.i1.should.equal('{"i2":"test"}')
xhr.respond(200, {}, 'Clicked!')
})
var div = make("<div hx-post='/vars' hx-vals='\"i1\":{\"i2\" : \"test\"}'></div>")
var div = make("<div hx-post='/vars' hx-vals='{\"i1\":{\"i2\" : \"test\"}}'></div>")
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
})

it('basic hx-vals can be unset', function() {
this.server.respondWith('POST', '/vars', function(xhr) {
var params = getParameters(xhr)
params.should.be.empty
xhr.respond(200, {}, 'Clicked!')
})
make(
"<div hx-vals='\"i1\":\"test\"'>\
<div id='d1' hx-post='/vars' hx-vals='unset'></div>\
</div>"
)
var div = byId('d1')
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
})

it('basic hx-vals with braces can be unset', function() {
this.server.respondWith('POST', '/vars', function(xhr) {
var params = getParameters(xhr)
params.should.be.empty
Expand All @@ -225,7 +196,7 @@ describe('hx-vals attribute', function() {
xhr.respond(200, {}, 'Clicked!')
})
make(
"<div hx-vals='\"v1\":\"test\", \"v2\":42'>\
"<div hx-vals='{\"v1\":\"test\", \"v2\":42'}>\
<div id='d1' hx-post='/vars' hx-vals='unset'></div>\
</div>"
)
Expand All @@ -242,7 +213,7 @@ describe('hx-vals attribute', function() {
xhr.respond(200, {}, 'Clicked!')
})
var div = make(
"<div hx-target='this' hx-vals='\"i1\":\"best\"'>\
"<div hx-target='this' hx-vals='{\"i1\":\"best\"}'>\
<input hx-post='/include' hx-vals='unset' hx-trigger='click' id='i1' name='i1' value='test'/>\
</div>"
)
Expand All @@ -264,7 +235,7 @@ describe('hx-vals attribute', function() {
should.not.exist(params.i1)
xhr.respond(200, {}, 'Clicked!')
})
var div = make('<div hx-post="/vars" hx-vals="javascript:i1:\'test\'"></div>')
var div = make('<div hx-post="/vars" hx-vals="javascript:{i1:\'test\'}"></div>')
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
Expand All @@ -287,7 +258,7 @@ describe('hx-vals attribute', function() {
should.not.exist(params.i1)
xhr.respond(200, {}, 'Clicked!')
})
var div = make('<div hx-post="/vars" hx-vals="js:i1:\'test\'"></div>')
var div = make('<div hx-post="/vars" hx-vals="js:{i1:\'test\'}"></div>')
div.click()
this.server.respond()
div.innerHTML.should.equal('Clicked!')
Expand Down
Loading