port bigskysoftware/htmx#2391

jamcole · Mar 13, 2024 · ca5573a · ca5573a
1 parent dc856c3
commit ca5573a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/sse/sse.js b/src/sse/sse.js
@@ -35,9 +35,10 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
      * @returns void
      */
     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()
@@ -47,7 +48,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)
       }
     }
   })

diff --git a/src/ws/ws.js b/src/ws/ws.js
@@ -36,11 +36,12 @@ 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()
@@ -49,7 +50,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)