expose overrideFormData in internal API, use it in ws.js for hx-vals processingws-fix-hx-vals

bigskysoftware/htmx-extensions#10

2 files changed, 2 insertions, 1 deletions

diff --git a/src/ext/ws.js b/src/ext/ws.js
index c1e29620..1e6ed1ad 100644
--- a/src/ext/ws.js
+++ b/src/ext/ws.js
@@ -345,7 +345,7 @@ This extension adds support for WebSockets to htmx.  See /www/extensions/ws.md f
 				var errors = results.errors;
 				var rawParameters = results.values;
 				var expressionVars = api.getExpressionVars(sendElt);
-				var allParameters = api.mergeObjects(rawParameters, expressionVars);
+				var allParameters = api.overrideFormData(rawParameters, expressionVars);
 				var filteredParameters = api.filterValues(allParameters, sendElt);
 
 				var sendConfig = {
diff --git a/src/htmx.js b/src/htmx.js
index b5b4f24e..4bd21f91 100644
--- a/src/htmx.js
+++ b/src/htmx.js
@@ -318,6 +318,7 @@ var htmx = (function() {
     mergeObjects,
     makeSettleInfo,
     oobSwap,
+    overrideFormData,
     querySelectorExt,
     settleImmediately,
     shouldCancel,