Skip to content

WS.js fix for Safari on iOS 17.4 #2391

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

Merged
1cg merged 2 commits into from
Mar 14, 2024
Merged

WS.js fix for Safari on iOS 17.4 #2391

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
695fd8a
ws.js: use event.detail.elt as fallback value for event.target
Renerick Mar 10, 2024
2335025
also fix sse.js
Renerick Mar 10, 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
5 changes: 3 additions & 2 deletions src/ext/sse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
*/
onEvent: function(name, evt) {

var parent = evt.target || evt.detail.elt;
switch (name) {

case "htmx:beforeCleanupElement":
var internalData = api.getInternalData(evt.target)
var internalData = api.getInternalData(parent)
// Try to remove remove an EventSource when elements are removed
if (internalData.sseEventSource) {
internalData.sseEventSource.close();
Expand All @@ -50,7 +51,7 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions

// Try to create EventSources when elements are processed
case "htmx:afterProcessNode":
ensureEventSourceOnElement(evt.target);
ensureEventSourceOnElement(parent);
}
}
});
Expand Down
5 changes: 2 additions & 3 deletions src/ext/ws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ This extension adds support for WebSockets to htmx. See /www/extensions/ws.md f
* @param {Event} evt
*/
onEvent: function (name, evt) {
var parent = evt.target || evt.detail.elt;

switch (name) {

// Try to close the socket when elements are removed
case "htmx:beforeCleanupElement":

var internalData = api.getInternalData(evt.target)
var internalData = api.getInternalData(parent)

if (internalData.webSocket) {
internalData.webSocket.close();
Expand All @@ -53,8 +54,6 @@ This extension adds support for WebSockets to htmx. See /www/extensions/ws.md f

// Try to create websockets when elements are processed
case "htmx:beforeProcessNode":
var parent = evt.target;

forEach(queryAttributeOnThisOrChildren(parent, "ws-connect"), function (child) {
ensureWebSocket(child)
});
Expand Down