Skip to content

Commit a440c6d

Browse files
committed
Merge branch 'master' into dev
2 parents 1b3e78c + 17a7dd1 commit a440c6d

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
* 100% test coverage! (Thank you @MichaelWest22!)
1111
* The default recommended CDN is now jsDelivr
12-
* TODO `inherit` keyword
12+
* The `inherit` keyword is now supported by `hx-include`, `hx-indicator` and `hx-disabled-elt` to allow you to inherit
13+
the value from a parent and extend it.
1314
* `hx-on` listeners are now added before processing nodes so events during processing can be captured
1415
* Using `<button hx-verb="/endpoint" type="reset">` will now reset the associated form (after submitting to `/endpoint`)
1516
* Using `<button formmethod="dialog">` will no longer submit its associated form

www/content/_index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ if(window.location.search=="?ads=true") {
9191
</a>
9292
</div>
9393

94-
<div class="alert">
95-
<b>NEWS:</b> htmx 2.0 has been released! It is not currently marked as <a href="https://docs.npmjs.com/cli/v10/commands/npm-dist-tag#purpose"><code>latest</code></a>
96-
in NPM so that people using the <a href="https://v1.htmx.org">1.x line</a> are not accidentally upgraded. We will mark
97-
2.0 as <code>latest</code> at some point in 2025.
98-
</div>
99-
10094
<h2>introduction</h2>
10195

10296
htmx gives you access to [AJAX](@/docs.md#ajax), [CSS Transitions](@/docs.md#css_transitions), [WebSockets](@/docs.md#websockets-and-sse) and [Server Sent Events](@/docs.md#websockets-and-sse)

www/content/server-examples.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ These examples may make it a bit easier to get started using htmx with your plat
5757
- <https://github.com/cscortes/htmxflask>
5858
- <https://github.com/Konfuzian/htmx-examples-with-flask/>
5959

60+
### Lua
61+
62+
- Lua Server Pages: <https://realtimelogic.com/articles/LSP-htmx-A-Powerful-Duo-for-Embedded-Web-Apps>
63+
6064
### py4web
6165

6266
- <https://github.com/jpsteil/py4web_htmx_demo>
@@ -235,4 +239,4 @@ These examples may make it a bit easier to get started using htmx with your plat
235239

236240
## FreePascal with Pas2JS
237241

238-
- <https://github.com/zendrael/create_htmx_pascal_app>
242+
- <https://github.com/zendrael/create_htmx_pascal_app>

0 commit comments

Comments
 (0)