itsscb/htmx
1
0
Fork 0
mirror of https://github.com/bigskysoftware/htmx.git synced 2025-10-02 15:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow expression vars to override raw parameters

Browse Source
This commit is contained in:
Ben Croker 2020-11-11 19:19:13 +01:00 committed by GitHub
parent 90bc460837
commit f2941b7a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/htmx.js
View File

@ -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);
@ -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) {
@ -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';
@ -1808,7 +1811,7 @@ return (function () {
var requestConfig = {
parameters: filteredParameters,
unfilteredParameters:rawParameters,
unfilteredParameters: allParameters,
headers:headers,
target:target,
verb:verb,