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

Allow expression vars to override raw parameters #232

Merged
merged 1 commit into from
Nov 15, 2020
Merged

Allow expression vars to override raw parameters #232

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
25 changes: 14 additions & 11 deletions src/htmx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,9 +993,11 @@ return (function () {
elt.addEventListener(getTriggerSpecs(elt)[0].trigger, function (evt) {
var headers = getHeaders(elt, webSocketSourceElt, null, elt);
var results = getInputValues(elt, 'post');
var rawParameters = results.values;
var errors = results.errors;
var filteredParameters = filterValues(rawParameters, elt);
var rawParameters = results.values;
var expressionVars = getExpressionVars(elt);
var allParameters = mergeObjects(rawParameters, expressionVars);
var filteredParameters = filterValues(allParameters, elt);
filteredParameters['HEADERS'] = headers;
if (errors && errors.length > 0) {
triggerEvent(elt, 'htmx:validation:halted', errors);
Expand Down Expand Up @@ -1703,22 +1705,22 @@ return (function () {
}
}

function addExpressionVars(elt, rawParameters) {
function getExpressionVars(elt, expressionVars = []) {
if (elt == null) {
return;
return expressionVars;
}
var attributeValue = getAttributeValue(elt, "hx-vars");
if (attributeValue) {
var varsValues = eval("({" + attributeValue + "})");
for (var key in varsValues) {
if (varsValues.hasOwnProperty(key)) {
if (rawParameters[key] == null) {
rawParameters[key] = varsValues[key];
if (expressionVars[key] == null) {
expressionVars[key] = varsValues[key];
}
}
}
}
addExpressionVars(parentElt(elt), rawParameters);
return getExpressionVars(parentElt(elt), expressionVars);
}

function safelySetHeaderValue(xhr, header, headerValue) {
Expand Down Expand Up @@ -1792,10 +1794,11 @@ return (function () {

var headers = getHeaders(elt, target, promptResponse, eventTarget);
var results = getInputValues(elt, verb);
var rawParameters = results.values;
var errors = results.errors;
addExpressionVars(elt, rawParameters);
var filteredParameters = filterValues(rawParameters, elt);
var rawParameters = results.values;
var expressionVars = getExpressionVars(elt);
var allParameters = mergeObjects(rawParameters, expressionVars);
var filteredParameters = filterValues(allParameters, elt);

if (verb !== 'get' && getClosestAttributeValue(elt, "hx-encoding") == null) {
headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
Expand All @@ -1808,7 +1811,7 @@ return (function () {

var requestConfig = {
parameters: filteredParameters,
unfilteredParameters:rawParameters,
unfilteredParameters: allParameters,
headers:headers,
target:target,
verb:verb,
Expand Down