Update htmx to latest hyperscript, fix tests

src/htmx.js

@@ -457,7 +457,7 @@ return (function () {
                 processNode(child);
                 processScripts(child);
                 processFocus(child)
-                triggerEvent(child, 'htmx:load', {});
+                triggerEvent(child, 'htmx:load');
             };
         }
 
@@ -978,14 +978,10 @@ return (function () {
             });
         }
 
-        function isHyperScriptAvailable() {
-            return typeof _hyperscript !== "undefined";
-        }
-
         function findElementsToProcess(elt) {
             if (elt.querySelectorAll) {
                 var results = elt.querySelectorAll(VERB_SELECTOR + ", a, form, [hx-sse], [data-hx-sse], [hx-ws]," +
-                    " [data-hx-ws], [_], [script], [data-script]");
+                    " [data-hx-ws]");
                 return results;
             } else {
                 return [];
@@ -997,10 +993,6 @@ return (function () {
             if (!nodeData.initialized) {
                 nodeData.initialized = true;
 
-                if (isHyperScriptAvailable()) {
-                    _hyperscript.init(elt);
-                }
-
                 if (elt.value) {
                     nodeData.lastValue = elt.value;
                 }

test/ext/hyperscript.js

@@ -11,6 +11,7 @@ describe("hyperscript integration", function() {
     it('can trigger with a custom event', function () {
         this.server.respondWith("GET", "/test", "Custom Event Sent!");
         var btn = make('<button _="on click send customEvent" hx-trigger="customEvent" hx-get="/test">Click Me!</button>')
+        htmx.trigger(btn, "htmx:load"); // have to manually trigger the load event for non-AJAX dynamic content
         btn.click();
         this.server.respond();
         btn.innerHTML.should.equal("Custom Event Sent!");
@@ -19,6 +20,7 @@ describe("hyperscript integration", function() {
     it('can handle htmx driven events', function () {
         this.server.respondWith("GET", "/test", "Clicked!");
         var btn = make('<button _="on htmx:afterSettle add .afterSettle" hx-get="/test">Click Me!</button>')
+        htmx.trigger(btn, "htmx:load");
         btn.classList.contains("afterSettle").should.equal(false);
         btn.click();
         this.server.respond();
@@ -29,9 +31,20 @@ describe("hyperscript integration", function() {
         this.server.respondWith("GET", "/test", [404, {}, "Bad request"]);
         var div = make('<div id="d1"></div>')
         var btn = make('<button _="on htmx:error(errorInfo) put errorInfo.error into #d1.innerHTML" hx-get="/test">Click Me!</button>')
+        htmx.trigger(btn, "htmx:load");
         btn.click();
         this.server.respond();
         div.innerHTML.should.equal("Response Status Error Code 404 from /test");
     });
 
+    it('hyperscript in non-htmx annotated nodes is evaluated', function () {
+        this.server.respondWith("GET", "/test", "<div><div><div id='d1' _='on click put \"Clicked...\" into my.innerHTML'></div></div></div>");
+        var btn = make('<button hx-get="/test">Click Me!</button>')
+        btn.click();
+        this.server.respond();
+        var newDiv = byId("d1");
+        newDiv.click();
+        newDiv.innerText.should.equal("Clicked...");
+    });
+
 });

test/index.html

@@ -92,9 +92,6 @@
 <!-- hyperscript integration -->
 <script src="lib/_hyperscript.js"></script>
 <script src="ext/hyperscript.js"></script>
-<script>
-    _hyperscript.start();
-</script>
 
 <!-- extension tests -->
 <script src="ext/extension-swap.js"></script>