diff --git a/assets/hx.js b/assets/hx.js new file mode 100644 index 0000000..be1ac09 --- /dev/null +++ b/assets/hx.js @@ -0,0 +1,30 @@ +// Site-wide htmx policy. Loaded right after htmx itself. +(function () { + // htmx wires up swapped-in content (e.g. a dialog's hx-post form) in its + // settle step, by default 20ms after the swap: a click or Enter in that + // window would submit the form natively. No settle transitions are used, + // so settle in the same tick. + htmx.config.defaultSettleDelay = 0; + + // A server-sent HX-Redirect follows a mutation (move, delete, …): load the + // target into the current history entry rather than pushing a new one, so + // Back skips the stale pre-mutation page. replaceState + reload rather than + // location.replace: a target differing only by #fragment would otherwise + // not re-fetch. + htmx.location = { + set href(target) { + window.history.replaceState(null, '', target); + window.location.reload(); + }, + reload: function () { window.location.reload(); } + }; + + // Failed requests answer with a plain-text reason; show it. + document.addEventListener('htmx:responseError', function (e) { + var xhr = e.detail.xhr; + alert(xhr.responseText || ('Request failed (' + xhr.status + ')')); + }); + document.addEventListener('htmx:sendError', function () { + alert('Network error'); + }); +})(); diff --git a/assets/layout.html b/assets/layout.html index f8bbe1f..29ceb4f 100644 --- a/assets/layout.html +++ b/assets/layout.html @@ -8,6 +8,8 @@ + + @@ -77,6 +79,7 @@ {{if not .EditMode}}{{block "aside" .}}{{end}}{{end}} {{block "extras" .}}{{end}} + {{end}} diff --git a/assets/modal.js b/assets/modal.js index 6b7dcc7..474384a 100644 --- a/assets/modal.js +++ b/assets/modal.js @@ -1,120 +1,111 @@ +// One modal at a time, from either of two sources sharing the same chrome +// (backdrop click, Escape, drag by the header, focus restore): +// - openModal(opts) builds a modal from JS; +// - server-rendered dialogs (assets/page/dialogs.html) that htmx swaps into +// #modal-host. Their forms post themselves; a [data-modal-close] element +// closes them. (function () { - var backdrop = null; - var modal = null; - var titleEl = null; - var bodyEl = null; - var cancelBtn = null; - var confirmBtn = null; - var footerEl = null; - var prevFocus = null; - var currentOpts = null; - var onKeydown = null; + var current = null; // { backdrop, prevFocus, onKeydown } + var drag = null; // { modal, startX, startY, originX, originY } - function build() { - backdrop = document.createElement('div'); + // show mounts backdrop (whose child is the .modal) into parent and makes + // it the current modal. onKeydown handles keys beyond Escape. + function show(backdrop, parent, prevFocus, onKeydown) { + var modal = backdrop.querySelector('.modal'); + var header = modal.querySelector('.panel-header'); + function onDown(e) { startDrag(e, modal); } + header.addEventListener('mousedown', onDown); + header.addEventListener('touchstart', onDown, { passive: false }); + backdrop.addEventListener('mousedown', function (e) { + if (e.target === backdrop) close(); + }); + backdrop.addEventListener('click', function (e) { + if (e.target.closest('[data-modal-close]')) close(); + }); + + var keydown = function (e) { + if (e.key === 'Escape') { + e.preventDefault(); + close(); + return; + } + if (onKeydown) onKeydown(e); + }; + document.addEventListener('keydown', keydown); + current = { backdrop: backdrop, prevFocus: prevFocus, onKeydown: keydown }; + if (backdrop.parentNode !== parent) parent.appendChild(backdrop); + } + + // Dragging switches the modal to fixed positioning so flexbox alignment + // doesn't fight us. + function startDrag(e, modal) { + if (e.button !== undefined && e.button !== 0) return; + var pt = e.touches ? e.touches[0] : e; + var rect = modal.getBoundingClientRect(); + modal.classList.add('is-dragged'); + modal.style.position = 'fixed'; + modal.style.left = rect.left + 'px'; + modal.style.top = rect.top + 'px'; + drag = { modal: modal, startX: pt.clientX, startY: pt.clientY, originX: rect.left, originY: rect.top }; + e.preventDefault(); + } + + function onMove(e) { + if (!drag) return; + var pt = e.touches ? e.touches[0] : e; + var m = drag.modal; + var maxX = window.innerWidth - m.offsetWidth; + var maxY = window.innerHeight - m.offsetHeight; + m.style.left = Math.max(0, Math.min(maxX, drag.originX + pt.clientX - drag.startX)) + 'px'; + m.style.top = Math.max(0, Math.min(maxY, drag.originY + pt.clientY - drag.startY)) + 'px'; + } + + function onUp() { drag = null; } + + document.addEventListener('mousemove', onMove); + document.addEventListener('touchmove', onMove, { passive: false }); + document.addEventListener('mouseup', onUp); + document.addEventListener('touchend', onUp); + + // detach tears down the current modal and returns the element that had + // focus before it opened. keepDOM leaves the backdrop in place for a swap + // about to replace it: htmx must still find the element that issued the + // request in the document. + function detach(keepDOM) { + if (!current) return null; + var c = current; + current = null; + drag = null; + document.removeEventListener('keydown', c.onKeydown); + if (!keepDOM && c.backdrop.parentNode) c.backdrop.parentNode.removeChild(c.backdrop); + return c.prevFocus; + } + + function close() { + var toRestore = detach(); + if (toRestore && toRestore.focus) { + try { toRestore.focus(); } catch (e) {} + } + } + + function open(opts) { + var prevFocus = current ? detach() : document.activeElement; + + var backdrop = document.createElement('div'); backdrop.className = 'modal-backdrop'; - - modal = document.createElement('div'); + var modal = document.createElement('div'); modal.className = 'modal panel panel-floating'; modal.setAttribute('role', 'dialog'); modal.setAttribute('aria-modal', 'true'); var header = document.createElement('div'); header.className = 'panel-header'; - titleEl = document.createElement('span'); + var titleEl = document.createElement('span'); + titleEl.textContent = opts.title || ''; header.appendChild(titleEl); - bodyEl = document.createElement('div'); + var bodyEl = document.createElement('div'); bodyEl.className = 'panel-body'; - - footerEl = document.createElement('div'); - footerEl.className = 'panel-footer'; - - cancelBtn = document.createElement('button'); - cancelBtn.type = 'button'; - confirmBtn = document.createElement('button'); - confirmBtn.type = 'button'; - - modal.appendChild(header); - modal.appendChild(bodyEl); - modal.appendChild(footerEl); - backdrop.appendChild(modal); - - backdrop.addEventListener('mousedown', function (e) { - if (e.target === backdrop) close(); - }); - wireDrag(header); - cancelBtn.addEventListener('click', close); - confirmBtn.addEventListener('click', function () { - if (confirmBtn.disabled) return; - if (currentOpts && currentOpts.confirm && currentOpts.confirm.onConfirm) { - currentOpts.confirm.onConfirm(); - } - }); - } - - // wireDrag makes the modal draggable by `handle`. Dragging switches the - // modal to fixed positioning so flexbox alignment doesn't fight us. - function wireDrag(handle) { - var dragging = false; - var startX, startY, originX, originY; - - function onDown(e) { - if (e.button !== undefined && e.button !== 0) return; - var pt = e.touches ? e.touches[0] : e; - var rect = modal.getBoundingClientRect(); - modal.classList.add('is-dragged'); - modal.style.position = 'fixed'; - modal.style.left = rect.left + 'px'; - modal.style.top = rect.top + 'px'; - dragging = true; - startX = pt.clientX; - startY = pt.clientY; - originX = rect.left; - originY = rect.top; - e.preventDefault(); - } - - function onMove(e) { - if (!dragging) return; - var pt = e.touches ? e.touches[0] : e; - var dx = pt.clientX - startX; - var dy = pt.clientY - startY; - var w = modal.offsetWidth; - var h = modal.offsetHeight; - var maxX = window.innerWidth - w; - var maxY = window.innerHeight - h; - var x = Math.max(0, Math.min(maxX, originX + dx)); - var y = Math.max(0, Math.min(maxY, originY + dy)); - modal.style.left = x + 'px'; - modal.style.top = y + 'px'; - } - - function onUp() { dragging = false; } - - handle.addEventListener('mousedown', onDown); - handle.addEventListener('touchstart', onDown, { passive: false }); - document.addEventListener('mousemove', onMove); - document.addEventListener('touchmove', onMove, { passive: false }); - document.addEventListener('mouseup', onUp); - document.addEventListener('touchend', onUp); - } - - function open(opts) { - if (backdrop && backdrop.parentNode) close(); - if (!backdrop) build(); - - currentOpts = opts; - prevFocus = document.activeElement; - - modal.classList.remove('is-dragged'); - modal.style.position = ''; - modal.style.left = ''; - modal.style.top = ''; - - titleEl.textContent = opts.title || ''; - - bodyEl.textContent = ''; if (opts.body instanceof Node) { bodyEl.appendChild(opts.body); } else if (typeof opts.body === 'string') { @@ -124,14 +115,24 @@ var confirmOpts = opts.confirm || {}; var cancelOpts = opts.cancel || {}; + var confirmBtn = document.createElement('button'); + confirmBtn.type = 'button'; confirmBtn.textContent = confirmOpts.label || 'OK'; confirmBtn.className = 'btn' + (confirmOpts.danger ? ' danger' : ''); confirmBtn.disabled = !!confirmOpts.initiallyDisabled; + confirmBtn.addEventListener('click', function () { + if (confirmBtn.disabled) return; + if (confirmOpts.onConfirm) confirmOpts.onConfirm(); + }); + var cancelBtn = document.createElement('button'); + cancelBtn.type = 'button'; cancelBtn.textContent = cancelOpts.label || 'CANCEL'; cancelBtn.className = 'btn'; + cancelBtn.setAttribute('data-modal-close', ''); - footerEl.textContent = ''; + var footerEl = document.createElement('div'); + footerEl.className = 'panel-footer'; if (opts.swapButtons) { footerEl.appendChild(confirmBtn); footerEl.appendChild(cancelBtn); @@ -140,7 +141,20 @@ footerEl.appendChild(confirmBtn); } - document.body.appendChild(backdrop); + modal.appendChild(header); + modal.appendChild(bodyEl); + modal.appendChild(footerEl); + backdrop.appendChild(modal); + + var enterConfirms = confirmOpts.enterConfirms !== false; + show(backdrop, document.body, prevFocus, function (e) { + if (e.key === 'Enter' && enterConfirms) { + var tag = (e.target && e.target.tagName) || ''; + if (tag === 'TEXTAREA') return; + e.preventDefault(); + if (!confirmBtn.disabled) confirmBtn.click(); + } + }); setTimeout(function () { if (cancelOpts.autofocus) { @@ -156,22 +170,6 @@ } }, 0); - var enterConfirms = confirmOpts.enterConfirms !== false; - onKeydown = function (e) { - if (e.key === 'Escape') { - e.preventDefault(); - close(); - return; - } - if (e.key === 'Enter' && enterConfirms) { - var tag = (e.target && e.target.tagName) || ''; - if (tag === 'TEXTAREA') return; - e.preventDefault(); - if (!confirmBtn.disabled) confirmBtn.click(); - } - }; - document.addEventListener('keydown', onKeydown); - return { close: close, setConfirmDisabled: function (d) { confirmBtn.disabled = !!d; }, @@ -179,20 +177,26 @@ }; } - function close() { - if (!backdrop || !backdrop.parentNode) return; - if (onKeydown) { - document.removeEventListener('keydown', onKeydown); - onKeydown = null; + // Server-rendered dialogs. A swap into #modal-host replaces whatever modal + // is open (e.g. the merge step replacing the move dialog); focus returns + // to where it was before the first one opened. + var hostPrevFocus = null; + document.addEventListener('htmx:beforeSwap', function (e) { + if (e.detail.target.id !== 'modal-host') return; + hostPrevFocus = current ? detach(true) : document.activeElement; + }); + document.addEventListener('htmx:afterSwap', function (e) { + var host = e.detail.target; + if (host.id !== 'modal-host') return; + var backdrop = host.querySelector('.modal-backdrop'); + if (!backdrop) return; + show(backdrop, host, hostPrevFocus); + var f = backdrop.querySelector('[autofocus]') || backdrop.querySelector('input:not([type=hidden])'); + if (f) { + f.focus(); + if (f.select) f.select(); } - backdrop.parentNode.removeChild(backdrop); - currentOpts = null; - var toRestore = prevFocus; - prevFocus = null; - if (toRestore && toRestore.focus) { - try { toRestore.focus(); } catch (e) {} - } - } + }); window.openModal = open; window.closeModal = close; diff --git a/assets/page/actions.js b/assets/page/actions.js index 92dbb59..b1cb03c 100644 --- a/assets/page/actions.js +++ b/assets/page/actions.js @@ -75,45 +75,10 @@ function newPage() { }); } -// submitMove POSTs a move and navigates on success. When the server reports -// the destination folder already exists but can be merged (the source carries -// a page and the destination has none), it asks the user to confirm and -// retries the same move with &merge=1. -function submitMove(action, target) { - fetch(action, { method: 'POST', redirect: 'manual' }).then(function (res) { - if (res.type === 'opaqueredirect' || res.ok) { - navigateReplace(target); - return; - } - if (res.status === 409 && res.headers.get('X-Merge-Available') === '1') { - openModal({ - title: 'Merge folders?', - body: 'The destination folder already exists but has no page of its own. Merge this page and its contents into it?', - confirm: { - label: 'MERGE', - onConfirm: function () { - closeModal(); - submitMove(action + '&merge=1', target); - } - } - }); - return; - } - return res.text().then(function (msg) { - alert(msg || ('Request failed (' + res.status + ')')); - }); - }).catch(function () { - alert('Network error'); - }); -} - function movePage() { var current = decodeURIComponent(window.location.pathname).replace(/\/+$/, ''); if (!current) return; - var segs = current.split('/').filter(Boolean); - var currentName = segs[segs.length - 1] || ''; - var parent = '/' + segs.slice(0, -1).join('/'); - if (parent === '/') parent = '/'; + var parent = '/' + current.split('/').filter(Boolean).slice(0, -1).join('/'); openTreePicker({ title: 'Move — new parent?', @@ -123,53 +88,13 @@ function movePage() { hideFiles: true, confirmLabel: 'NEXT', onSelect: function (newParent) { - var input = document.createElement('input'); - input.type = 'text'; - input.className = 'input'; - input.placeholder = 'Page name'; - input.value = currentName; - - openModal({ - title: 'Move — new name?', - body: input, - confirm: { - label: 'MOVE', - onConfirm: function () { - var name = input.value.trim(); - if (!name) return; - var dest = (newParent === '/' ? '' : newParent) + '/' + name; - var action = window.location.pathname + '?move=' + - encodeURIComponent(dest); - var target = encodePickedPath(dest) + '/'; - closeModal(); - submitMove(action, target); - } - } + // The server renders the name step and handles what follows + // (merge confirmation, errors, redirect). + closeModal(); + htmx.ajax('GET', window.location.pathname + '?dialog=move', { + target: '#modal-host', + values: { parent: newParent } }); } }); } - -function deletePage() { - var decodedPath = decodeURIComponent(window.location.pathname); - - openModal({ - title: 'Delete page', - body: 'Delete ' + decodedPath + ' and everything inside it?', - confirm: { - label: 'DELETE', - danger: true, - enterConfirms: false, - onConfirm: function () { - var p = window.location.pathname.replace(/\/+$/, ''); - var idx = p.lastIndexOf('/'); - var parent = idx > 0 ? p.substring(0, idx + 1) : '/'; - closeModal(); - postReplace(window.location.pathname + '?delete=1', null, parent); - } - }, - cancel: { autofocus: true }, - swapButtons: true - }); -} - diff --git a/assets/page/dialogs.html b/assets/page/dialogs.html new file mode 100644 index 0000000..34f8cda --- /dev/null +++ b/assets/page/dialogs.html @@ -0,0 +1,46 @@ +{{/* Server-rendered dialogs, fetched with ?dialog= and swapped into +#modal-host by htmx; modal.js supplies the chrome (backdrop, Escape, drag, +focus). Each dialog is a form that posts the action it offers, so the client +never builds action URLs itself. Responses to those posts either redirect +(HX-Redirect), replace the dialog with the next step (e.g. the merge +confirmation), or fail with a plain-text error. */}} + +{{define "delete"}}
+ +
{{end}} + +{{define "move"}}
+ +
{{end}} + +{{define "merge"}}
+ +
{{end}} diff --git a/assets/page/main.html b/assets/page/main.html index e147b5c..ba6262d 100644 --- a/assets/page/main.html +++ b/assets/page/main.html @@ -5,7 +5,7 @@ {{if not .IsRoot}} - + {{end}} {{icon "edit"}}EDIT {{end}}{{end}} diff --git a/assets/vendor/htmx.min.js b/assets/vendor/htmx.min.js new file mode 100644 index 0000000..e6b8394 --- /dev/null +++ b/assets/vendor/htmx.min.js @@ -0,0 +1 @@ +var htmx=function(){"use strict";const Y={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=pn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true,historyRestoreAsHxRequest:true,reportValidityOfForms:false},parseInterval:null,location:location,_:null,version:"2.0.11"};Y.onLoad=V;Y.process=Bt;Y.on=ye;Y.off=xe;Y.trigger=ae;Y.ajax=In;Y.find=a;Y.findAll=x;Y.closest=g;Y.remove=z;Y.addClass=w;Y.removeClass=S;Y.toggleClass=G;Y.takeClass=W;Y.swap=C;Y.defineExtension=zn;Y.removeExtension=Jn;Y.logAll=$;Y.logNone=_;Y.parseInterval=d;Y._=e;const n={addTriggerHandler:Et,bodyContains:ie,canAccessLocalStorage:U,findThisElement:we,filterValues:xn,swap:C,hasAttribute:s,getAttributeValue:f,getClosestAttributeValue:te,getClosestMatch:A,getExpressionVars:qn,getHeaders:yn,getInputValues:pn,getInternalData:re,getSwapSpecification:vn,getTriggerSpecs:lt,getTarget:Se,makeFragment:D,mergeObjects:se,makeSettleInfo:En,oobSwap:Te,querySelectorExt:ce,settleImmediately:Qt,shouldCancel:dt,triggerEvent:ae,triggerErrorEvent:ue,withExtensions:Vt};const he=["get","post","put","delete","patch"];const R=he.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function Q(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function f(e,t){return Q(e,t)||Q(e,"data-"+t)}function u(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function ee(){return document}function q(e,t){return e.getRootNode?e.getRootNode({composed:t}):ee()}function A(e,t){while(e&&!t(e)){e=u(e)}return e||null}function o(e,t,n){const r=f(t,n);const o=f(t,"hx-disinherit");var i=f(t,"hx-inherit");if(e!==t){if(Y.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function te(t,n){let r=null;A(t,function(e){return!!(r=o(t,le(e),n))});if(r!=="unset"){return r}}function h(e,t){return e instanceof Element&&e.matches(t)}function N(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function I(e){if("parseHTMLUnsafe"in Document){return Document.parseHTMLUnsafe(e)}const t=new DOMParser;return t.parseFromString(e,"text/html")}function L(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function r(e){const t=ee().createElement("script");oe(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Y.config.inlineScriptNonce){t.nonce=Y.config.inlineScriptNonce}return t}function i(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function k(e){if(!Y.config.allowScriptTags){e.querySelectorAll("script").forEach(e=>e.remove());return}Array.from(e.querySelectorAll("script")).forEach(e=>{if(i(e)){const t=r(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){T(e)}finally{e.remove()}}})}function D(e){e=e.replace(/]*)?)>/gi,'");const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=N(t);let r;if(n==="html"){r=new DocumentFragment;const i=I(e);L(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=I(t);L(r,i.body);r.title=i.title}else{const i=I('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){k(r)}return r}function ne(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function P(e){return typeof e==="function"}function M(e){return t(e,"Object")}function re(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function F(t){const n=[];if(t){for(let e=0;e=0}function ie(e){return e.getRootNode({composed:true})===document}function X(e){return e.trim().split(/\s+/)}function se(e,t){return Object.assign({},e,t)}function v(e){try{return JSON.parse(e)}catch(e){T(e);return null}}function U(){const e="htmx:sessionStorageTest";try{sessionStorage.setItem(e,e);sessionStorage.removeItem(e);return true}catch(e){return false}}function j(e){try{const t=new URL(e,window.location.href);e=t.pathname+t.search}catch(e){}if(e!="/"){e=e.replace(/\/+$/,"")}return e}function e(e){return Tn(ee().body,function(){return eval(e)})}function V(t){const e=Y.on("htmx:load",function(e){t(e.detail.elt)});return e}function $(){Y.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function _(){Y.logger=null}function a(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return a(ee(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(ee(),e)}}function b(){return window}function z(e,t){e=E(e);if(t){b().setTimeout(function(){z(e);e=null},t)}else{u(e).removeChild(e)}}function le(e){return e instanceof Element?e:null}function J(e){return e instanceof HTMLElement?e:null}function K(e){return typeof e==="string"?e:null}function p(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function w(e,t,n){e=le(E(e));if(!e){return}if(n){b().setTimeout(function(){w(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function S(e,t,n){let r=le(E(e));if(!r){return}if(n){b().setTimeout(function(){S(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function G(e,t){e=E(e);e.classList.toggle(t)}function W(e,t){e=E(e);oe(e.parentElement.children,function(e){S(e,t)});w(le(e),t)}function g(e,t){e=le(E(e));if(e){return e.closest(t)}return null}function l(e,t){return e.substring(0,t.length)===t}function Z(e,t){return e.substring(e.length-t.length)===t}function de(e){const t=e.trim();if(l(t,"<")&&Z(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function m(t,r,n){if(r.indexOf("global ")===0){return m(t,r.slice(7),true)}t=E(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=de(o.shift());let e;if(r.indexOf("closest ")===0){e=g(le(t),de(r.slice(8)))}else if(r.indexOf("find ")===0){e=a(p(t),de(r.slice(5)))}else if(r==="next"||r==="nextElementSibling"){e=le(t).nextElementSibling}else if(r.indexOf("next ")===0){e=pe(t,de(r.slice(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=le(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=ge(t,de(r.slice(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=q(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=p(q(t,!!n));i.push(...F(c.querySelectorAll(e)))}return i}var pe=function(t,e,n){const r=p(q(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ce(e,t){if(typeof e!=="string"){return m(e,t)[0]}else{return m(ee().body,e)[0]}}function E(e,t){if(typeof e==="string"){return a(p(t)||document,e)}else{return e}}function me(e,t,n,r){if(P(t)){return{target:ee().body,event:K(e),listener:t,options:n}}else{return{target:E(e),event:K(t),listener:n,options:r}}}function ye(t,n,r,o){Wn(function(){const e=me(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=P(n);return e?n:r}function xe(t,n,r){Wn(function(){const e=me(t,n,r);e.target.removeEventListener(e.event,e.listener)});return P(n)?n:r}const be=ee().createElement("output");function ve(t,n){const e=te(t,n);if(e){if(e==="this"){return[we(t,n)]}else{const r=m(t,e);const o=/(^|,)(\s*)inherit(\s*)($|,)/.test(e);if(o){const i=le(A(t,function(e){return e!==t&&s(le(e),n)}));if(i){r.push(...ve(i,n))}}if(r.length===0){T('The selector "'+e+'" on '+n+" returned no matches!");return[be]}else{return r}}}}function we(e,t){return le(A(e,function(e){return f(le(e),t)!=null}))}function Se(e){const t=te(e,"hx-target");if(t){if(t==="this"){return we(e,"hx-target")}else{return ce(e,t)}}else{const n=re(e);if(n.boosted){return ee().body}else{return e}}}function Ee(e){return Y.config.attributesToSettle.includes(e)}function Ce(t,n){oe(Array.from(t.attributes),function(e){if(!n.hasAttribute(e.name)&&Ee(e.name)){t.removeAttribute(e.name)}});oe(n.attributes,function(e){if(Ee(e.name)){t.setAttribute(e.name,e.value)}})}function Oe(t,e){const n=Kn(e);for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=m(t,n,false);if(r.length){oe(r,function(e){let t;const n=o.cloneNode(true);t=ee().createDocumentFragment();t.appendChild(n);if(!Oe(s,e)){t=p(n)}const r={shouldSwap:true,target:e,fragment:t};if(!ae(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){Re(t);Ve(s,e,e,t,i);He()}oe(i.elts,function(e){ae(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);ue(ee().body,"htmx:oobErrorNoTarget",{content:o,target:n})}return e}function He(){const e=a("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=a("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function Re(e){oe(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=f(e,"id");const n=ee().getElementById(t);if(n!=null){if(e.moveBefore){let e=a("#--htmx-preserve-pantry--");if(e==null){ee().body.insertAdjacentHTML("afterend","
");e=a("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function qe(i,e,s){oe(e.querySelectorAll("[id]"),function(t){const n=Q(t,"id");if(n&&n.length>0){const e=p(i);const r=e&&e.querySelector(CSS.escape(t.tagName)+"#"+CSS.escape(n));if(r&&r!==e){const o=t.cloneNode();Ce(t,r);s.tasks.push(function(){Ce(t,o)})}}})}function Ae(e){return function(){S(e,Y.config.addedClass);Bt(le(e));Ne(p(e));ae(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=J(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function c(e,t,n,r){qe(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;w(le(o),Y.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Ae(o))}}}function Ie(e,t){let n=0;while(n0}function _e(e,n,r){var t=x(e,"[hx-swap-oob], [data-hx-swap-oob]");oe(t,function(e){if(Y.config.allowNestedOobSwaps||e.parentElement===null){const t=f(e,"hx-swap-oob");if(t!=null){Te(t,e,n,r)}}else{e.removeAttribute("hx-swap-oob");e.removeAttribute("data-hx-swap-oob")}});return t.length>0}function C(d,p,g,m){if(!m){m={}}let y=null;let n=null;let e=function(){ne(m.beforeSwapCallback);d=E(d);const r=m.contextElement&&m.contextElement.isConnected?q(m.contextElement,false):ee();const e=document.activeElement;let t={};t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null};const o=En(d);if(g.swapStyle==="textContent"){d.textContent=p}else{let n=typeof p==="string"?D(p):p;o.title=m.title||n.title;if(m.historyRequest){n=n.querySelector("[hx-history-elt],[data-hx-history-elt]")||n}if(m.selectOOB){const s=m.selectOOB.split(",");for(let t=0;t0){b().setTimeout(n,g.settleDelay)}else{n()}};let t=Y.config.globalViewTransitions;if(g.hasOwnProperty("transition")){t=g.transition}const r=m.contextElement||ee();if(t&&ae(r,"htmx:beforeTransition",m.eventInfo)&&typeof Promise!=="undefined"&&document.startViewTransition){const o=new Promise(function(e,t){y=e;n=t});const i=e;e=function(){document.startViewTransition(function(){i();return o})}}try{if(g?.swapDelay&&g.swapDelay>0){b().setTimeout(e,g.swapDelay)}else{e()}}catch(e){ue(r,"htmx:swapError",m.eventInfo);ne(n);throw e}}function ze(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=v(r)||{};for(const i of Object.keys(o)){let e=o[i];if(M(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}ae(n,i,e)}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=Tn(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){ue(ee().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(nt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function O(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function ot(e){let t;if(e.length>0&&Qe.test(e[0])){e.shift();t=O(e,et).trim();e.shift()}else{t=O(e,Ke)}return t}const it="input, textarea, select";function st(e,t,n){const r=[];const o=tt(t);do{O(o,Ye);const l=o.length;const c=O(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};O(o,Ye);u.pollInterval=d(O(o,/[,\[\s]/));O(o,Ye);var i=rt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const a={trigger:c};var i=rt(e,o,"event");if(i){a.eventFilter=i}O(o,Ye);while(o.length>0&&o[0]!==","){const f=o.shift();if(f==="changed"){a.changed=true}else if(f==="once"){a.once=true}else if(f==="consume"){a.consume=true}else if(f==="delay"&&o[0]===":"){o.shift();a.delay=d(O(o,Ke))}else if(f==="from"&&o[0]===":"){o.shift();if(Qe.test(o[0])){var s=ot(o)}else{var s=O(o,Ke);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=ot(o);if(h.length>0){s+=" "+h}}}a.from=s}else if(f==="target"&&o[0]===":"){o.shift();a.target=ot(o)}else if(f==="throttle"&&o[0]===":"){o.shift();a.throttle=d(O(o,Ke))}else if(f==="queue"&&o[0]===":"){o.shift();a.queue=O(o,Ke)}else if(f==="root"&&o[0]===":"){o.shift();a[f]=ot(o)}else if(f==="threshold"&&o[0]===":"){o.shift();a[f]=O(o,Ke)}else{ue(e,"htmx:syntax:error",{token:o.shift()})}O(o,Ye)}r.push(a)}}if(o.length===l){ue(e,"htmx:syntax:error",{token:o.shift()})}O(o,Ye)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function lt(e){const t=f(e,"hx-trigger");let n=[];if(t){const r=Y.config.triggerSpecsCache;n=r&&r[t]||st(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,it)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function ct(e){re(e).cancelled=true}function ut(e,t,n){const r=re(e);r.timeout=b().setTimeout(function(){if(ie(e)&&r.cancelled!==true){if(!gt(n,e,Ut("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ut(e,t,n)}},n.pollInterval)}function at(e){return location.hostname===e.hostname&&Q(e,"href")&&Q(e,"href").indexOf("#")!==0}function ft(e){return g(e,Y.config.disableSelector)}function ht(t,n,e){if(t instanceof HTMLAnchorElement&&at(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(Q(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=Q(t,"href")}else{const i=Q(t,"method");r=i?i.toLowerCase():"get";o=Q(t,"action");if(o==null||o===""){o=location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){mt(t,function(e,t){const n=le(e);if(ft(n)){y(n);return}fe(r,o,n,t)},n,e,true)})}}function dt(e,t){if(e.type==="submit"&&t.tagName==="FORM"){return true}else if(e.type==="click"){const n=t.closest('input[type="submit"], button');if(n&&n.form&&n.type==="submit"){return true}const r=t.closest("a");const o=/^#.+/;if(r&&r.href&&!o.test(r.getAttribute("href"))){return true}}return false}function pt(e,t){return re(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function gt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;ue(ee().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function mt(l,c,e,u,a){const f=re(l);let t;if(u.from){t=m(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in f)){f.lastValue=new WeakMap}t.forEach(function(e){if(!f.lastValue.has(u)){f.lastValue.set(u,new WeakMap)}f.lastValue.get(u).set(e,e.value)})}oe(t,function(i){const s=function(e){if(!ie(l)){i.removeEventListener(u.trigger,s);return}if(pt(l,e)){return}if(a||dt(e,i)){e.preventDefault()}if(gt(u,l,e)){return}const t=re(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(le(e.target),u.target)){return}}if(u.once){if(f.triggeredOnce){return}else{f.triggeredOnce=true}}if(u.changed){const n=e.target;const r=n.value;const o=f.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(f.delayed){clearTimeout(f.delayed)}if(f.throttle){return}if(u.throttle>0){if(!f.throttle){ae(l,"htmx:trigger");c(l,e);f.throttle=b().setTimeout(function(){f.throttle=null},u.throttle)}}else if(u.delay>0){f.delayed=b().setTimeout(function(){ae(l,"htmx:trigger");c(l,e)},u.delay)}else{ae(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let yt=false;let xt=null;function bt(){if(!xt){xt=function(){yt=true};window.addEventListener("scroll",xt);window.addEventListener("resize",xt);setInterval(function(){if(yt){yt=false;oe(ee().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){vt(e)})}},200)}}function vt(e){if(!s(e,"data-hx-revealed")&&B(e)){e.setAttribute("data-hx-revealed","true");const t=re(e);if(t.initHash){ae(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){ae(e,"revealed")},{once:true})}}}function wt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;ae(e,"htmx:trigger");t(e)}};if(r>0){b().setTimeout(o,r)}else{o()}}function St(t,n,e){let i=false;oe(he,function(r){if(s(t,"hx-"+r)){const o=f(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){Et(t,e,n,function(e,t){const n=le(e);if(ft(n)){y(n);return}fe(r,o,n,t)})})}});return i}function Et(r,e,t,n){if(e.trigger==="revealed"){bt();mt(r,n,t,e);vt(le(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ce(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ut(le(r),n,e)}else{mt(r,n,t,e)}}function Ct(e){const t=le(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function qt(e){const t=Nt(e.target);const n=Lt(e);if(n){n.lastButtonClicked=t}}function At(e){const t=Lt(e);if(t){t.lastButtonClicked=null}}function Nt(e){return g(le(e),"button, input[type='submit']")}function It(e){return e.form||g(e,"form")}function Lt(e){const t=Nt(e.target);if(!t){return}const n=It(t);if(!n){return}return re(n)}function kt(e){e.addEventListener("click",qt);e.addEventListener("focusin",qt);e.addEventListener("focusout",At)}function Dt(t,e,n){const r=re(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){Tn(t,function(){if(ft(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function Pt(t){ke(t);for(let e=0;eY.config.historyCacheSize){i.shift()}while(i.length>0){try{sessionStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){ue(ee().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Kt(t){if(!U()){return null}t=j(t);const n=v(sessionStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){r.response=this.response;ae(ee().body,"htmx:historyCacheMissLoad",r);C(r.historyElt,r.response,n,{contextElement:r.historyElt,historyRequest:true});_t(r.path);ae(ee().body,"htmx:historyRestore",{path:e,cacheMiss:true,serverResponse:r.response})}else{ue(ee().body,"htmx:historyCacheMissLoadError",r)}};if(ae(ee().body,"htmx:historyCacheMiss",r)){t.send()}}function tn(e){Wt();e=e||location.pathname+location.search;const t=Kt(e);if(t){const n={swapStyle:"innerHTML",swapDelay:0,settleDelay:0,scroll:t.scroll};const r={path:e,item:t,historyElt:zt(),swapSpec:n};if(ae(ee().body,"htmx:historyCacheHit",r)){C(r.historyElt,t.content,n,{contextElement:r.historyElt,title:t.title});_t(r.path);ae(ee().body,"htmx:historyRestore",r)}}else{if(Y.config.refreshOnHistoryMiss){Y.location.reload(true)}else{en(e)}}}function nn(e){let t=ve(e,"hx-indicator");if(t==null){t=[e]}oe(t,function(e){const t=re(e);t.requestCount=(t.requestCount||0)+1;w(e,Y.config.requestClass)});return t}function rn(e){let t=ve(e,"hx-disabled-elt");if(t==null){t=[]}oe(t,function(e){const t=re(e);t.requestCount=(t.requestCount||0)+1;if(!e.hasAttribute("disabled")){e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")}});return t}function on(e,t){oe(e.concat(t),function(e){const t=re(e);t.requestCount=(t.requestCount||1)-1});oe(e,function(e){const t=re(e);if(t.requestCount===0){S(e,Y.config.requestClass)}});oe(t,function(e){const t=re(e);if(t.requestCount===0&&e.hasAttribute("data-disabled-by-htmx")){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function sn(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);oe(e,e=>r.append(t,e))}}function an(e){if(e instanceof HTMLSelectElement&&e.multiple){return F(e.querySelectorAll("option:checked")).map(function(e){return e.value})}if(e instanceof HTMLInputElement&&e.files){return F(e.files)}return e.value}function fn(t,n,r,e,o){if(e==null||sn(t,e)){return}else{t.push(e)}if(ln(e)){const i=Q(e,"name");cn(i,an(e),n);if(o){hn(e,r)}}if(e instanceof HTMLFormElement){oe(e.elements,function(e){if(t.indexOf(e)>=0){un(e.name,an(e),n)}else{t.push(e)}if(o){hn(e,r)}});new FormData(e).forEach(function(e,t){if(e instanceof File&&e.name===""){return}cn(t,e,n)})}}function hn(e,t){const n=e;if(n.willValidate){ae(n,"htmx:validation:validate");if(!n.checkValidity()){if(ae(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})&&!t.length&&Y.config.reportValidityOfForms){n.reportValidity()}t.push({elt:n,message:n.validationMessage,validity:n.validity})}}}function dn(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function pn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=re(e);if(s.lastButtonClicked&&!ie(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||f(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){fn(n,o,i,It(e),l)}fn(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&Q(e,"type")==="submit"){const u=s.lastButtonClicked||e;const a=Q(u,"name");cn(a,u.value,o)}const c=ve(e,"hx-include");oe(c,function(e){fn(n,r,i,le(e),l);if(!h(e,"form")){oe(p(e).querySelectorAll(it),function(e){fn(n,r,i,e,l)})}});dn(r,o);return{errors:i,formData:r,values:Mn(r)}}function gn(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function mn(e){e=Dn(e);let n="";e.forEach(function(e,t){n=gn(n,t,e)});return n}function yn(e,t,n){const r={"HX-Request":"true","HX-Trigger":Q(e,"id"),"HX-Trigger-Name":Q(e,"name"),"HX-Target":f(t,"id"),"HX-Current-URL":location.href};On(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(re(e).boosted){r["HX-Boosted"]="true"}return r}function xn(n,e){const t=te(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){oe(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;oe(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function bn(e){return!!Q(e,"href")&&Q(e,"href").indexOf("#")>=0}function vn(e,t){const n=t||te(e,"hx-swap");const r={swapStyle:re(e).boosted?"innerHTML":Y.config.defaultSwapStyle,swapDelay:Y.config.defaultSwapDelay,settleDelay:Y.config.defaultSettleDelay};if(Y.config.scrollIntoViewOnBoost&&re(e).boosted&&!bn(e)){r.show="top"}if(n){const s=X(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const a=l.slice(5);var o=a.split(":");const f=o.pop();var i=o.length>0?o.join(":"):null;r.show=f;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{T("Unknown modifier in hx-swap: "+l)}}}}return r}function wn(e){return te(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&Q(e,"enctype")==="multipart/form-data"}function Sn(t,n,r){let o=null;Vt(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(wn(n)){return dn(new FormData,Dn(r))}else{return mn(r)}}}function En(e){return{tasks:[],elts:[e]}}function Cn(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=le(ce(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}if(typeof t.scroll==="number"){b().setTimeout(function(){window.scrollTo(0,t.scroll)},0)}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=le(ce(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Y.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Y.config.scrollBehavior})}}}function On(r,e,o,i,s){if(i==null){i={}}if(r==null){return i}const l=f(r,e);if(l){let e=l.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=Tn(r,function(){if(s){return Function("event","return ("+e+")").call(r,s)}else{return Function("return ("+e+")").call(r)}},{})}else{n=v(e)}for(const c of Object.keys(n)){if(i[c]==null){i[c]=n[c]}}}return On(le(u(r)),e,o,i,s)}function Tn(e,t,n){if(Y.config.allowEval){return t()}else{ue(e,"htmx:evalDisallowedError");return n}}function Hn(e,t,n){return On(e,"hx-vars",true,n,t)}function Rn(e,t,n){return On(e,"hx-vals",false,n,t)}function qn(e,t){return se(Hn(e,t),Rn(e,t))}function An(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function Nn(t){if(t.responseURL){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){ue(ee().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function H(e,t){return e.getResponseHeader(t)!==null}function In(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return fe(t,n,null,null,{targetOverride:E(r)||be,returnPromise:true})}else{let e=E(r.target);if(r.target&&!e||r.source&&!e&&!E(r.source)){e=be}return fe(t,n,E(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true,push:r.push,replace:r.replace,selectOOB:r.selectOOB})}}else{return fe(t,n,null,null,{returnPromise:true})}}function Ln(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function kn(e,t,n){const r=new URL(t,location.protocol!=="about:"?location.href:window.origin);const o=location.protocol!=="about:"?location.origin:window.origin;const i=o===r.origin;if(Y.config.selfRequestsOnly){if(!i){return false}}return ae(e,"htmx:validateUrl",se({url:r,sameHost:i},n))}function Dn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n of Object.keys(e)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}return t}function Pn(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function Mn(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Pn(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function fe(t,n,r,o,i,P){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=ee().body}const M=i.handler||Vn;const F=i.select||null;if(!ie(r)){ne(s);return e}const c=i.targetOverride||le(Se(r));if(c==null||c==be){ue(r,"htmx:targetError",{target:te(r,"hx-target")});ne(l);return e}let u=re(r);const a=u.lastButtonClicked;if(a){const A=Q(a,"formaction");if(A!=null){n=A}const N=Q(a,"formmethod");if(N!=null){if(he.includes(N.toLowerCase())){t=N}else{ne(s);return e}}}const f=te(r,"hx-confirm");if(P===undefined){const K=function(e){return fe(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:f};if(ae(r,"htmx:confirm",G)===false){ne(s);return e}}let h=r;let d=te(r,"hx-sync");let p=null;let B=false;if(d){const I=d.split(":");const L=I[0].trim();if(L==="this"){h=we(r,"hx-sync")}else{h=le(ce(r,L))}d=(I[1]||"drop").trim();u=re(h);if(d==="drop"&&u.xhr&&u.abortable!==true){ne(s);return e}else if(d==="abort"){if(u.xhr){ne(s);return e}else{B=true}}else if(d==="replace"){ae(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");p=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){ae(h,"htmx:abort")}else{if(p==null){if(o){const k=re(o);if(k&&k.triggerSpec&&k.triggerSpec.queue){p=k.triggerSpec.queue}}if(p==null){p="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(p==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){fe(t,n,r,o,i)})}else if(p==="all"){u.queuedRequests.push(function(){fe(t,n,r,o,i)})}else if(p==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){fe(t,n,r,o,i)})}ne(s);return e}}const g=new XMLHttpRequest;u.xhr=g;u.abortable=B;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const X=te(r,"hx-prompt");if(X){var y=prompt(X);if(y===null||!ae(r,"htmx:prompt",{prompt:y,target:c})){ne(s);m();return e}}if(f&&!P){if(!confirm(f)){ne(s);m();return e}}let x=yn(r,c,y);if(t!=="get"&&!wn(r)){x["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){x=se(x,i.headers)}const U=pn(r,t);let b=U.errors;const j=U.formData;if(i.values){dn(j,Dn(i.values))}const V=Dn(qn(r,o));const v=dn(j,V);let w=xn(v,r);if(Y.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",Q(c,"id")||"true")}if(n==null||n===""){n=location.href}const S=On(r,"hx-request");const $=re(r).boosted;let E=Y.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:$,useUrlParams:E,formData:w,parameters:Mn(w),unfilteredFormData:v,unfilteredParameters:Mn(v),headers:x,elt:r,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Y.config.withCredentials,timeout:i.timeout||S.timeout||Y.config.timeout,path:n,triggeringEvent:o};if(!ae(r,"htmx:configRequest",C)){ne(s);m();return e}n=C.path;t=C.verb;x=C.headers;w=Dn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){ae(r,"htmx:validation:halted",C);ne(s);m();return e}const _=n.split("#");const z=_[0];const O=_[1];let T=n;if(E){T=z;const Z=!w.keys().next().done;if(Z){if(T.indexOf("?")<0){T+="?"}else{T+="&"}T+=mn(w);if(O){T+="#"+O}}}if(!kn(r,T,C)){ue(r,"htmx:invalidPath",C);ne(l);m();return e}g.open(t.toUpperCase(),T,true);g.overrideMimeType("text/html");g.withCredentials=C.withCredentials;g.timeout=C.timeout;if(S.noHeaders){}else{for(const D of Object.keys(x)){An(g,D,x[D])}}const H={xhr:g,target:c,requestConfig:C,etc:i,boosted:$,select:F,pathInfo:{requestPath:n,finalRequestPath:T,responsePath:null,anchor:O}};g.onload=function(){try{const t=Ln(r);H.pathInfo.responsePath=Nn(g);M(r,H);if(H.keepIndicators!==true){on(R,q)}ae(r,"htmx:afterRequest",H);ae(r,"htmx:afterOnLoad",H);if(!ie(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(ie(n)){e=n}}if(e){ae(e,"htmx:afterRequest",H);ae(e,"htmx:afterOnLoad",H)}}ne(s)}catch(e){ue(r,"htmx:onLoadError",se({error:e},H));throw e}finally{m()}};g.onerror=function(){on(R,q);ue(r,"htmx:afterRequest",H);ue(r,"htmx:sendError",H);ne(l);m()};g.onabort=function(){on(R,q);ue(r,"htmx:afterRequest",H);ue(r,"htmx:sendAbort",H);ne(l);m()};g.ontimeout=function(){on(R,q);ue(r,"htmx:afterRequest",H);ue(r,"htmx:timeout",H);ne(l);m()};if(!ae(r,"htmx:beforeRequest",H)){ne(s);m();return e}var R=nn(r);var q=rn(r);oe(["loadstart","loadend","progress","abort"],function(t){oe([g,g.upload],function(e){e.addEventListener(t,function(e){ae(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ae(r,"htmx:beforeSend",H);const J=E?null:Sn(g,r,w);g.send(J);return e}function Fn(e,t){const n=t.xhr;let r=null;let o=null;if(H(n,"HX-Push")){r=n.getResponseHeader("HX-Push");o="push"}else if(H(n,"HX-Push-Url")){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(H(n,"HX-Replace-Url")){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=t.etc.push||te(e,"hx-push-url");let c=t.etc.replace||te(e,"hx-replace-url");if(c==="false")c=null;const u=re(e).boosted;let a=null;let f=null;if(l){a="push";f=l}else if(c){a="replace";f=c}else if(u){a="push";f=s||i}if(f){if(f==="false"){return{}}if(f==="true"){f=s||i}if(t.pathInfo.anchor&&f.indexOf("#")===-1){f=f+"#"+t.pathInfo.anchor}return{type:a,path:f}}else{return{}}}function Bn(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Xn(e){for(var t=0;t`+`.${t}{opacity:0;visibility: hidden} `+`.${n} .${t}, .${n}.${t}{opacity:1;visibility: visible;transition: opacity 200ms ease-in}`+"")}}function Yn(){const e=ee().querySelector('meta[name="htmx-config"]');if(e){return v(e.content)}else{return null}}function Qn(){const e=Yn();if(e){Y.config=se(Y.config,e)}}Wn(function(){Qn();Zn();let e=ee().body;Bt(e);const t=ee().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.detail.elt||e.target;const n=re(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){tn();oe(t,function(e){ae(e,"htmx:restored",{document:ee(),triggerEvent:ae})})}else{if(n){n(e)}}};b().setTimeout(function(){ae(e,"htmx:load",{});e=null},0)});return Y}(); \ No newline at end of file diff --git a/dialogs.go b/dialogs.go new file mode 100644 index 0000000..03fcf3e --- /dev/null +++ b/dialogs.go @@ -0,0 +1,68 @@ +package main + +import ( + "html/template" + "log" + "net/http" + "path" + "strings" +) + +var dialogTmpl = template.Must(template.New("dialogs").ParseFS(assets, "assets/page/dialogs.html")) + +// isHX reports whether r was issued by htmx. +func isHX(r *http.Request) bool { + return r.Header.Get("HX-Request") == "true" +} + +// redirectAfter sends the client to target once a mutation succeeded. htmx +// requests get HX-Redirect (assets/hx.js turns it into a history replace, so +// Back skips the pre-mutation page); plain form posts get a 303. +func redirectAfter(w http.ResponseWriter, r *http.Request, target string) { + if isHX(r) { + w.Header().Set("HX-Redirect", target) + w.WriteHeader(http.StatusNoContent) + return + } + http.Redirect(w, r, target, http.StatusSeeOther) +} + +// pageURL returns the escaped, slash-terminated browser URL of the page at +// the wiki path p ("/" or "/a/b", trailing slash optional). +func pageURL(p string) string { + p = strings.Trim(p, "/") + if p == "" { + return "/" + } + return fileURL(p) + "/" +} + +// renderDialog writes the named dialog from dialogs.html. +func renderDialog(w http.ResponseWriter, name string, data any) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := dialogTmpl.ExecuteTemplate(w, name, data); err != nil { + log.Printf("dialog template error: %v", err) + } +} + +// serveDialog handles GET ?dialog= for the page at urlPath. +func (h *handler) serveDialog(w http.ResponseWriter, r *http.Request, urlPath string) { + page := normalizeMovePath(urlPath) + if page == "/" { + http.Error(w, "not available for the wiki root", http.StatusBadRequest) + return + } + switch r.URL.Query().Get("dialog") { + case "delete": + renderDialog(w, "delete", struct{ Path string }{urlPath}) + case "move": + // parent comes from the folder picker; default to the current one. + parent := r.URL.Query().Get("parent") + if parent == "" { + parent = path.Dir(page) + } + renderDialog(w, "move", struct{ Parent, Name string }{parent, path.Base(page)}) + default: + http.NotFound(w, r) + } +} diff --git a/e2e/tests/pages.spec.js b/e2e/tests/pages.spec.js index c4ee55d..84b197a 100644 --- a/e2e/tests/pages.spec.js +++ b/e2e/tests/pages.spec.js @@ -2,7 +2,7 @@ // visible labels, not implementation details, so they keep passing when the // client-side mechanics change (e.g. the move to HTMX). import { test, expect } from "@playwright/test"; -import { mkdirSync, readFileSync } from "node:fs"; +import { mkdirSync, readFileSync, writeFileSync } from "node:fs"; import { dirname, join } from "node:path"; import { fileURLToPath } from "node:url"; @@ -78,7 +78,7 @@ test("move renames a page", async ({ page }) => { await pageAction(page, "Move page (M)"); // Tree picker preselects the current parent; keep it. await modal(page).getByRole("button", { name: "NEXT" }).click(); - await modal(page).locator("input").fill("Gamma"); + await modal(page).getByPlaceholder("Page name").fill("Gamma"); await modal(page).getByRole("button", { name: "MOVE" }).click(); await expect(page).toHaveURL(/\/Projects\/Gamma\/$/); await expect(page.locator("main h1")).toContainText("Beta"); @@ -89,7 +89,7 @@ test("move onto an empty folder offers a merge", async ({ page }) => { await page.goto("/Projects/Alpha/"); await pageAction(page, "Move page (M)"); await modal(page).getByRole("button", { name: "NEXT" }).click(); - await modal(page).locator("input").fill("Empty"); + await modal(page).getByPlaceholder("Page name").fill("Empty"); await modal(page).getByRole("button", { name: "MOVE" }).click(); await expect(modal(page)).toContainText("Merge folders?"); await modal(page).getByRole("button", { name: "MERGE" }).click(); @@ -105,3 +105,50 @@ test("delete removes a page and returns to the parent", async ({ page }) => { await expect(page).toHaveURL(/127\.0\.0\.1:\d+\/$/); await expect(sidebar(page).getByRole("link", { name: "Notes" })).toHaveCount(0); }); + +test("delete replaces the history entry, so Back skips the deleted page", async ({ page }) => { + mkdirSync(join(wiki, "Scratch", "Gone"), { recursive: true }); + writeFileSync(join(wiki, "Scratch", "Gone", "index.md"), "# Gone\n"); + await page.goto("/Scratch/"); + await page.goto("/Scratch/Gone/"); + await pageAction(page, "Delete page"); + await modal(page).getByRole("button", { name: "DELETE" }).click(); + await expect(page).toHaveURL(/\/Scratch\/$/); + await page.goBack(); + await expect(page).toHaveURL(/\/Scratch\/$/); +}); + +test("server dialogs close with Escape and CANCEL", async ({ page }) => { + await page.goto("/Projects/"); + await pageAction(page, "Delete page"); + await expect(modal(page)).toBeVisible(); + // CANCEL is focused, so Enter must not delete. + await expect(modal(page).getByRole("button", { name: "CANCEL" })).toBeFocused(); + await page.keyboard.press("Escape"); + await expect(modal(page)).toHaveCount(0); + await pageAction(page, "Delete page"); + await modal(page).getByRole("button", { name: "CANCEL" }).click(); + await expect(modal(page)).toHaveCount(0); + await expect(page).toHaveURL(/\/Projects\/$/); +}); + +test("a failed move shows the server's reason and keeps the dialog", async ({ page }) => { + mkdirSync(join(wiki, "Taken"), { recursive: true }); + writeFileSync(join(wiki, "Taken", "index.md"), "# Taken\n"); + mkdirSync(join(wiki, "Mover"), { recursive: true }); + writeFileSync(join(wiki, "Mover", "index.md"), "# Mover\n"); + await page.goto("/Mover/"); + await pageAction(page, "Move page (M)"); + await modal(page).getByRole("button", { name: "NEXT" }).click(); + await modal(page).getByPlaceholder("Page name").fill("Taken"); + // Dismiss the alert from the handler: an open alert blocks the click. + const messages = []; + page.on("dialog", (d) => { + messages.push(d.message()); + d.dismiss(); + }); + await modal(page).getByRole("button", { name: "MOVE" }).click(); + await expect.poll(() => messages).toEqual([expect.stringContaining("destination already exists")]); + await expect(modal(page)).toBeVisible(); + await expect(page).toHaveURL(/\/Mover\/$/); +}); diff --git a/main.go b/main.go index 768db2d..61a2a1f 100644 --- a/main.go +++ b/main.go @@ -301,6 +301,10 @@ func (h *handler) serveDir(w http.ResponseWriter, r *http.Request, urlPath, fsPa h.handlePost(w, r, urlPath, fsPath) return } + if r.URL.Query().Has("dialog") { + h.serveDialog(w, r, urlPath) + return + } for _, ph := range pageTypeHandlers { if target, ok := ph.redirect(h.root, fsPath, urlPath, r); ok { @@ -427,7 +431,18 @@ func (h *handler) handlePost(w http.ResponseWriter, r *http.Request, urlPath, fs return } if _, ok := query["move"]; ok { - h.handleMove(w, r, urlPath, fsPath, query.Get("move"), query.Has("merge")) + // The destination comes either whole (?move=/dst, or the merge + // dialog's move field) or as the move dialog's parent + name. + // Body fields take precedence over the bare ?move query key. + if err := r.ParseForm(); err != nil { + http.Error(w, "bad request", http.StatusBadRequest) + return + } + dst := r.FormValue("move") + if name := strings.TrimSpace(r.FormValue("name")); dst == "" && name != "" { + dst = strings.TrimRight(r.FormValue("parent"), "/") + "/" + name + } + h.handleMove(w, r, urlPath, fsPath, dst, r.FormValue("merge") != "") return } if query.Has("toggle") { diff --git a/moves.go b/moves.go index bd3a953..574b1eb 100644 --- a/moves.go +++ b/moves.go @@ -14,8 +14,7 @@ import ( // The one exception is a merge: when the source carries a page (index.md) and // the destination folder has none, the source's contents can fill the empty // container without clobbering anything. That merge only proceeds when merge -// is true; otherwise the client is told a merge is available so it can ask the -// user to confirm. +// is true; otherwise the client is asked to confirm it. func (h *handler) handleMove(w http.ResponseWriter, r *http.Request, srcURL, srcFsPath, dstURL string, merge bool) { oldPath := normalizeMovePath(srcURL) if oldPath == "/" { @@ -51,9 +50,12 @@ func (h *handler) handleMove(w http.ResponseWriter, r *http.Request, srcURL, src return } if !merge { - // Ask the client to confirm the merge. The header lets it tell - // this apart from an ordinary conflict. - w.Header().Set("X-Merge-Available", "1") + // Ask the user to confirm: htmx clients get the merge dialog as + // the next step; others a conflict they can retry with &merge=1. + if isHX(r) { + renderDialog(w, "merge", struct{ Dest string }{newPath}) + return + } http.Error(w, "destination already exists — merge folders?", http.StatusConflict) return } @@ -94,7 +96,7 @@ func (h *handler) handleMove(w http.ResponseWriter, r *http.Request, srcURL, src folderIndexRenameSubtree(strings.TrimPrefix(oldPath, "/"), strings.TrimPrefix(newPath, "/")) } - http.Redirect(w, r, fileURL(strings.TrimPrefix(newPath, "/"))+"/", http.StatusSeeOther) + redirectAfter(w, r, pageURL(newPath)) } // canMergeMove reports whether moving onto an existing destination should @@ -169,7 +171,7 @@ func (h *handler) handleDelete(w http.ResponseWriter, r *http.Request, urlPath, return } folderIndexRemoveSubtree(strings.TrimPrefix(normalizeMovePath(urlPath), "/")) - http.Redirect(w, r, parentURL(urlPath), http.StatusSeeOther) + redirectAfter(w, r, pageURL(parentURL(urlPath))) } // normalizeMovePath returns the absolute path with any trailing slash removed,