' + escapeHtml(msg) + '
';
}
@@ -8193,13 +9221,37 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
+ escapeHtml(msg) + '';
}
- async function renderInline(node) {
+ async function renderInline(node, opts) {
+ opts = opts || {};
var container = document.getElementById('previewBody');
var titleEl = document.getElementById('previewTitle');
var metaEl = document.getElementById('previewMeta');
var popoutBtn = document.getElementById('previewPopout');
if (!container) return;
+ // Guard unsaved editor edits before we tear the editor down.
+ var dm = dirtyEditor();
+ if (dm) {
+ var cur = dm.currentNode ? dm.currentNode() : null;
+ if (samePreviewNode(cur, node)) {
+ // Re-selecting the file we're already editing — don't reload
+ // and clobber the in-progress edits.
+ return;
+ }
+ if (opts.auto) {
+ // Keyboard/auto preview (cursor walking the tree): leave the
+ // dirty editor in place rather than prompting on every key.
+ return;
+ }
+ var label = cur ? cur.name : 'this file';
+ if (!window.confirm('Discard unsaved changes to ' + label + '?')) return;
+ }
+ // Safe to replace the pane now: dispose any live editor so its
+ // instance + document-level listeners don't leak.
+ disposeEditors();
+
+ var seq = ++renderSeq;
+
if (titleEl) titleEl.textContent = node.name;
if (metaEl) {
var meta = [];
@@ -8216,7 +9268,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
window.app.modules.markdown &&
typeof window.app.modules.markdown.render === 'function') {
try {
- await window.app.modules.markdown.render(node, container, { getArrayBuffer: getArrayBuffer });
+ await window.app.modules.markdown.render(node, container, { getArrayBuffer: getArrayBuffer, getContentWithVersion: getContentWithVersion });
} catch (e) {
renderError(container, 'Markdown render failed: ' + (e.message || e));
}
@@ -8229,7 +9281,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var yamlMod = window.app.modules.yamledit;
if (yamlMod && yamlMod.handles(node)) {
try {
- await yamlMod.render(node, container, { getArrayBuffer: getArrayBuffer });
+ await yamlMod.render(node, container, { getArrayBuffer: getArrayBuffer, getContentWithVersion: getContentWithVersion });
} catch (e) {
renderError(container, 'YAML render failed: ' + (e.message || e));
}
@@ -8240,6 +9292,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (ext === 'pdf' || ext === 'html' || ext === 'htm') {
try {
var info = await getBlobUrl(node);
+ if (seq !== renderSeq) return;
var sandbox = (ext === 'pdf') ? '' : ' sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox"';
container.innerHTML = '';
} catch (e) {
@@ -8252,6 +9305,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (preview && preview.isImage(ext) && !preview.isTiff(ext)) {
try {
var imgInfo = await getBlobUrl(node);
+ if (seq !== renderSeq) return;
container.innerHTML = ''
+ 'No inline preview for " URL (405).
- function isZipMemberNode(node) {
- if (node.handle && node.handle.isZipEntry) return true;
- if (node.url && window.app.state.source === 'server' && /\.zip\//i.test(node.url)) return true;
- return false;
- }
+ var isZipMemberNode = util.isZipMemberNode;
function canSave(node) {
if (isZipMemberNode(node)) return false;
@@ -8808,11 +9850,21 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
dispose();
- // Read content.
- var text;
+ // Read content + the server version token (etag/last-modified) so
+ // the save can send an If-Match precondition and detect a concurrent
+ // edit instead of clobbering it. Falls back to getArrayBuffer (and a
+ // null token → no precondition) for callers/sources without it.
+ var text, loadedEtag = null, loadedLastModified = null;
try {
- var buf = await ctx.getArrayBuffer(node);
- text = new TextDecoder('utf-8', { fatal: false }).decode(buf);
+ if (ctx.getContentWithVersion) {
+ var loaded = await ctx.getContentWithVersion(node);
+ text = new TextDecoder('utf-8', { fatal: false }).decode(loaded.buf);
+ loadedEtag = loaded.etag;
+ loadedLastModified = loaded.lastModified;
+ } else {
+ var buf = await ctx.getArrayBuffer(node);
+ text = new TextDecoder('utf-8', { fatal: false }).decode(buf);
+ }
} catch (e) {
container.innerHTML =
'
.' + escapeHtml(ext) + '. '
@@ -8464,13 +9523,18 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (node.isDir) return;
opts = opts || {};
if (opts.popup) return renderInPopup(node);
- return renderInline(node);
+ return renderInline(node, opts);
}
window.app.modules.preview = {
showFilePreview: showFilePreview,
+ // Tear down any live editor + blank the pane (rescope / popstate).
+ clearPreview: clearPreview,
// Expose for the markdown plugin so it can read file bytes.
- getArrayBuffer: getArrayBuffer
+ getArrayBuffer: getArrayBuffer,
+ // Like getArrayBuffer but also returns the {etag, lastModified}
+ // version token — the editors use it for optimistic-concurrency saves.
+ getContentWithVersion: getContentWithVersion
};
})();
@@ -8518,34 +9582,39 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var SIDEBAR_DEFAULT_WIDTH = 280;
var FM_DEFAULT_HEIGHT = 180; // px — front-matter pane height inside sidebar
- function escapeHtml(s) {
- return String(s).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
- }
+ var util = window.app.modules.util;
+ var escapeHtml = util.escapeHtml;
+ var hashContent = util.hashContent;
var currentInstance = null; // { editor, container, dirty, node, hash, tocEl, fmEl }
var lastSidebarWidth = SIDEBAR_DEFAULT_WIDTH; // remember across mounts
var lastFmHeight = FM_DEFAULT_HEIGHT;
- async function hashContent(text) {
- if (!window.crypto || !window.crypto.subtle) return null;
- var enc = new TextEncoder().encode(text);
- var buf = await window.crypto.subtle.digest('SHA-256', enc);
- var bytes = new Uint8Array(buf);
- var hex = '';
- for (var i = 0; i < bytes.length; i++) {
- hex += bytes[i].toString(16).padStart(2, '0');
- }
- return hex;
- }
-
function dispose() {
- if (currentInstance && currentInstance.editor) {
- try { currentInstance.editor.destroy(); } catch (_) { /* ignore */ }
+ if (currentInstance) {
+ // Tear down the document-level resizer drag listeners (added
+ // lazily on mousedown). They're normally removed on mouseup,
+ // but a dispose mid-drag — or any switch away — would otherwise
+ // strand them pointing at the dead shell. The AbortController
+ // removes whatever is still attached in one call.
+ if (currentInstance.ac) {
+ try { currentInstance.ac.abort(); } catch (_) { /* ignore */ }
+ }
+ if (currentInstance.editor) {
+ try { currentInstance.editor.destroy(); } catch (_) { /* ignore */ }
+ }
}
currentInstance = null;
}
+ function isDirty() {
+ return !!(currentInstance && currentInstance.dirty);
+ }
+
+ function currentNode() {
+ return currentInstance ? currentInstance.node : null;
+ }
+
// ── Front matter ────────────────────────────────────────────────────────
// Lightweight YAML front-matter parser. Same envelope as mdedit's:
// `---\n…\n---\n`, key:value lines, simple `[a, b, c]` arrays.
@@ -8749,38 +9818,11 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// ── Save ────────────────────────────────────────────────────────────────
- async function saveContent(node, content) {
- if (node.handle && typeof node.handle.createWritable === 'function') {
- // Local folders are picked read-only; escalate to readwrite on
- // first save (one FS-Access prompt, then granted for the session).
- var up = window.app.modules.upload;
- if (up && up.ensureWritable) await up.ensureWritable();
- var writable = await node.handle.createWritable();
- await writable.write(content);
- await writable.close();
- return;
- }
- if (node.url && window.app.state.source === 'server') {
- var resp = await fetch(node.url, {
- method: 'PUT',
- headers: { 'Content-Type': 'text/markdown; charset=utf-8' },
- body: content,
- credentials: 'same-origin'
- });
- if (!resp.ok) throw new Error('HTTP ' + resp.status);
- return;
- }
- throw new Error('No write target for this file (read-only source).');
+ function saveContent(node, content, opts) {
+ return util.saveFile(node, content, 'text/markdown; charset=utf-8', opts);
}
- // A markdown file living inside a .zip is read-only: a ZipFileHandle
- // refuses createWritable (offline / nested), and zddc-server refuses
- // writes to a "<…>.zip/'
@@ -9040,15 +10092,24 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}));
}
- currentInstance = {
+ // One AbortController per mount — wired into the document-level
+ // resizer listeners below so dispose() can detach them all at once.
+ var ac = new AbortController();
+ var instance = {
editor: editor,
container: container,
dirty: false,
node: node,
hash: initialHash,
tocEl: tocBody,
- fmEl: fmTextarea
+ fmEl: fmTextarea,
+ ac: ac,
+ // Server version token captured at load — sent as If-Match on
+ // save and refreshed from each successful PUT's response ETag.
+ etag: loadedEtag,
+ lastModified: loadedLastModified
};
+ currentInstance = instance;
if (!writableMode) {
saveBtn.disabled = true;
@@ -9085,8 +10146,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
resizer.classList.add('is-dragging');
startX = e.clientX;
startW = sidebar.getBoundingClientRect().width;
- document.addEventListener('mousemove', onMove);
- document.addEventListener('mouseup', onUp);
+ document.addEventListener('mousemove', onMove, { signal: ac.signal });
+ document.addEventListener('mouseup', onUp, { signal: ac.signal });
e.preventDefault();
});
resizer.addEventListener('keydown', function (e) {
@@ -9130,8 +10191,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
fmResizer.classList.add('is-dragging');
startY = e.clientY;
startH = fmSection.getBoundingClientRect().height;
- document.addEventListener('mousemove', onMove);
- document.addEventListener('mouseup', onUp);
+ document.addEventListener('mousemove', onMove, { signal: ac.signal });
+ document.addEventListener('mouseup', onUp, { signal: ac.signal });
e.preventDefault();
});
fmResizer.addEventListener('keydown', function (e) {
@@ -9146,7 +10207,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// ── Change tracking + auto-rerender ────────────────────────────────
function markDirty(isDirty) {
- currentInstance.dirty = isDirty;
+ if (currentInstance !== instance) return; // editor replaced
+ instance.dirty = isDirty;
// Re-read canSave at every transition, not via a closure-captured
// value, so the gate reflects current write authority — see the
// matching pattern in preview-yaml.js.
@@ -9154,35 +10216,106 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
dirtyEl.textContent = isDirty ? '● modified' : '';
}
+ // The debounced handlers can resolve AFTER this editor was disposed
+ // and a new file mounted (the timer + the await both outlive the
+ // switch). Bail when we're no longer the active instance so we never
+ // call into a destroyed Toast UI editor or write the wrong file's
+ // dirty/hash state.
var onChange = debounce(async function () {
+ if (currentInstance !== instance) return;
var body = editor.getMarkdown();
var h = await hashContent(assembleContent(fmTextarea.value, body));
- markDirty(h !== currentInstance.hash);
+ if (currentInstance !== instance) return;
+ markDirty(h !== instance.hash);
renderToc(tocBody, body, editor);
}, 250);
editor.on('change', onChange);
var onFmChange = debounce(async function () {
+ if (currentInstance !== instance) return;
var body = editor.getMarkdown();
var h = await hashContent(assembleContent(fmTextarea.value, body));
- markDirty(h !== currentInstance.hash);
+ if (currentInstance !== instance) return;
+ markDirty(h !== instance.hash);
}, 250);
fmTextarea.addEventListener('input', onFmChange);
// ── Save ───────────────────────────────────────────────────────────
+ // Mark a successful write: adopt the new server ETag (so the next
+ // save's If-Match matches — no false conflict on save→edit→save),
+ // refresh the dirty baseline, clear dirty.
+ async function markSaved(content, res) {
+ if (currentInstance !== instance) return;
+ if (res && res.etag) instance.etag = res.etag;
+ instance.hash = await hashContent(content);
+ if (currentInstance !== instance) return;
+ markDirty(false);
+ statusEl.textContent = 'Saved ' + new Date().toLocaleTimeString();
+ if (window.zddc && window.zddc.toast) {
+ window.zddc.toast('Saved ' + node.name, 'success');
+ }
+ }
+
+ // 412 → the file changed on the server since we loaded it. Open the
+ // shared conflict dialog rather than clobbering. Dirty stays set
+ // until the user resolves.
+ async function resolveConflict(content) {
+ var conflict = window.app.modules.conflict;
+ var prev = window.app.modules.preview;
+ if (!conflict || !prev) return; // no UI available — leave dirty
+ await conflict.open({
+ filename: node.name,
+ mineText: content,
+ fetchTheirs: function () {
+ return prev.getContentWithVersion(node).then(function (r) {
+ return new TextDecoder('utf-8', { fatal: false }).decode(r.buf);
+ });
+ },
+ // Overwrite: re-fetch the CURRENT version and save against it
+ // (still 412s on a third concurrent writer rather than blind-
+ // forcing).
+ onOverwrite: function () {
+ return prev.getContentWithVersion(node).then(function (cur) {
+ return saveContent(node, content, { etag: cur.etag, lastModified: cur.lastModified });
+ }).then(function (res) { return markSaved(content, res); });
+ },
+ // Reload theirs: discard local edits. Clear dirty first so the
+ // renderInline dirty-guard skips its confirm; the fresh render
+ // re-captures content + a new ETag.
+ onReload: function () {
+ markDirty(false);
+ instance.dirty = false;
+ return prev.showFilePreview(node);
+ },
+ onSaveCopy: function () {
+ return util.saveCopy(node, content, 'text/markdown; charset=utf-8')
+ .then(function (name) {
+ if (window.zddc && window.zddc.toast) {
+ window.zddc.toast('Saved your version as ' + name, 'success');
+ }
+ });
+ }
+ });
+ if (currentInstance === instance) statusEl.textContent = '';
+ }
+
async function save() {
- if (!currentInstance.dirty || !canSave(node)) return;
+ if (currentInstance !== instance) return;
+ if (!instance.dirty || !canSave(node)) return;
var content = assembleContent(fmTextarea.value, editor.getMarkdown());
try {
statusEl.textContent = 'Saving…';
- await saveContent(node, content);
- currentInstance.hash = await hashContent(content);
- markDirty(false);
- statusEl.textContent = 'Saved ' + new Date().toLocaleTimeString();
- if (window.zddc && window.zddc.toast) {
- window.zddc.toast('Saved ' + node.name, 'success');
- }
+ var res = await saveContent(node, content, {
+ etag: instance.etag, lastModified: instance.lastModified
+ });
+ await markSaved(content, res);
} catch (e) {
+ if (e && e.status === 412) {
+ if (currentInstance !== instance) return;
+ statusEl.textContent = 'Conflict — resolving…';
+ await resolveConflict(content);
+ return;
+ }
statusEl.textContent = 'Save failed: ' + (e.message || e);
if (window.zddc && window.zddc.toast) {
window.zddc.toast('Save failed: ' + (e.message || e), 'error');
@@ -9208,7 +10341,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
convertBtns.forEach(function (a) {
a.addEventListener('click', async function (e) {
var fmt = a.dataset.fmt;
- if (!currentInstance.dirty) {
+ if (!instance.dirty) {
// Clean — let the browser handle the click. The
// server's response (DOCX/HTML/PDF bytes, 422,
// 503, etc.) lands in whatever target the user
@@ -9227,7 +10360,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
statusEl.textContent = 'Saving before download…';
try { await save(); } catch (_) { /* save() surfaces its own error */ }
- if (currentInstance.dirty) return; // save failed; toast already shown
+ if (currentInstance !== instance || instance.dirty) return; // save failed / switched away
statusEl.textContent = 'Downloading ' + fmt.toUpperCase() + '…';
// Re-trigger the click. dirty=false now so the handler
// exits early on the second pass and the browser
@@ -9239,7 +10372,9 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
window.app.modules.markdown = {
render: render,
- dispose: dispose
+ dispose: dispose,
+ isDirty: isDirty,
+ currentNode: currentNode
};
})();
@@ -9267,10 +10402,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (!window.app || !window.app.modules) return;
- function escapeHtml(s) {
- return String(s).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
- }
+ var util = window.app.modules.util;
+ var escapeHtml = util.escapeHtml;
// ── Filename routing ────────────────────────────────────────────────────
@@ -9292,32 +10425,14 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// ── Save (mirrors preview-markdown.js) ─────────────────────────────────
- async function saveContent(node, content) {
- if (node.handle && typeof node.handle.createWritable === 'function') {
- var writable = await node.handle.createWritable();
- await writable.write(content);
- await writable.close();
- return;
- }
- if (node.url && window.app.state.source === 'server') {
- var resp = await fetch(node.url, {
- method: 'PUT',
- headers: { 'Content-Type': 'application/x-yaml; charset=utf-8' },
- body: content,
- credentials: 'same-origin'
- });
- if (!resp.ok) throw new Error('HTTP ' + resp.status);
- return;
- }
- throw new Error('No write target for this file (read-only source).');
+ function saveContent(node, content, opts) {
+ // Via the shared saveFile so local (FS-Access) saves escalate to
+ // readwrite the same as the markdown editor — previously this path
+ // skipped ensureWritable and failed on read-only-picked folders.
+ return util.saveFile(node, content, 'application/x-yaml; charset=utf-8', opts);
}
- function isZipMemberNode(node) {
- if (node.handle && node.handle.isZipEntry) return true;
- if (node.url && window.app.state.source === 'server'
- && /\.zip\//i.test(node.url)) return true;
- return false;
- }
+ var isZipMemberNode = util.isZipMemberNode;
function canSave(node) {
if (isZipMemberNode(node)) return false;
@@ -9341,17 +10456,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return false;
}
- async function hashContent(text) {
- if (!window.crypto || !window.crypto.subtle) return null;
- var enc = new TextEncoder().encode(text);
- var buf = await window.crypto.subtle.digest('SHA-256', enc);
- var bytes = new Uint8Array(buf);
- var hex = '';
- for (var i = 0; i < bytes.length; i++) {
- hex += bytes[i].toString(16).padStart(2, '0');
- }
- return hex;
- }
+ var hashContent = util.hashContent;
// ── .zddc schema ────────────────────────────────────────────────────────
//
@@ -9381,9 +10486,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
worm: 'string[]',
paths: 'pathmap',
display: 'stringmap',
- apps: 'appsmap',
- apps_pubkey: 'string',
tables: 'stringmap',
+ views: 'viewmap',
convert: 'convert',
created_by: 'string',
inherit: 'bool'
@@ -9500,19 +10604,29 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
walkObject(v, TOP_KEYS, path.concat([seg]), issues);
}
return;
- case 'appsmap':
+ case 'viewmap':
if (t === 'null') return;
if (t !== 'object') { addTypeErr(path, kind, t, issues); return; }
- for (var app in val) {
- if (!Object.prototype.hasOwnProperty.call(val, app)) continue;
- if (!ALLOWED_TOOLS[app]) {
- issues.push({ keyPath: path.concat([app]), severity: 'warning',
- message: 'Unknown tool "' + app + '" in apps:.' });
+ for (var shape in val) {
+ if (!Object.prototype.hasOwnProperty.call(val, shape)) continue;
+ if (['dir', 'dir_slash', 'file'].indexOf(shape) === -1) {
+ issues.push({ keyPath: path.concat([shape]), severity: 'warning',
+ message: 'Unknown view shape "' + shape + '" (known: dir, dir_slash, file).' });
}
- if (typeOf(val[app]) !== 'string') {
- issues.push({ keyPath: path.concat([app]), severity: 'error',
- message: 'apps.' + app + ' must be a spec string '
- + '(channel | v | URL | path).' });
+ var vv = val[shape];
+ if (typeOf(vv) !== 'object') {
+ issues.push({ keyPath: path.concat([shape]), severity: 'error',
+ message: 'views.' + shape + ' must be a map ({tool, config}).' });
+ continue;
+ }
+ if (typeOf(vv.tool) !== 'string' || !ALLOWED_TOOLS[vv.tool]) {
+ issues.push({ keyPath: path.concat([shape, 'tool']), severity: 'warning',
+ message: 'views.' + shape + '.tool should be a known tool ('
+ + Object.keys(ALLOWED_TOOLS).join(', ') + ').' });
+ }
+ if (vv.config !== undefined && typeOf(vv.config) !== 'string') {
+ issues.push({ keyPath: path.concat([shape, 'config']), severity: 'error',
+ message: 'views.' + shape + '.config must be a filename string.' });
}
}
return;
@@ -9623,12 +10737,30 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// ── Mount ───────────────────────────────────────────────────────────────
var currentEditor = null;
+ var currentDirty = false;
+ var currentNodeRef = null;
+ // Server version token for the loaded file — sent as If-Match on save
+ // and refreshed from each successful PUT's response ETag.
+ var currentEtag = null;
+ var currentLastModified = null;
function dispose() {
// CM doesn't have an explicit destroy(); GC handles it once
// the host element is removed. Clear our reference so a stale
// editor doesn't keep handlers alive.
currentEditor = null;
+ currentDirty = false;
+ currentNodeRef = null;
+ currentEtag = null;
+ currentLastModified = null;
+ }
+
+ function isDirty() {
+ return currentDirty;
+ }
+
+ function currentNode() {
+ return currentNodeRef;
}
async function render(node, container, ctx) {
@@ -9640,10 +10772,17 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
dispose();
- var text;
+ var text, loadedEtag = null, loadedLastModified = null;
try {
- var buf = await ctx.getArrayBuffer(node);
- text = new TextDecoder('utf-8', { fatal: false }).decode(buf);
+ if (ctx.getContentWithVersion) {
+ var loaded = await ctx.getContentWithVersion(node);
+ text = new TextDecoder('utf-8', { fatal: false }).decode(loaded.buf);
+ loadedEtag = loaded.etag;
+ loadedLastModified = loaded.lastModified;
+ } else {
+ var buf = await ctx.getArrayBuffer(node);
+ text = new TextDecoder('utf-8', { fatal: false }).decode(buf);
+ }
} catch (e) {
container.innerHTML =
'
'
@@ -9744,6 +10883,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// Force an initial lint pass now that _zddcNode is set.
editor.performLint();
currentEditor = editor;
+ currentNodeRef = node;
+ currentDirty = false;
+ currentEtag = loadedEtag;
+ currentLastModified = loadedLastModified;
if (!writable) {
saveBtn.disabled = true;
@@ -9759,15 +10902,69 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var initialHash = await hashContent(text);
function markDirty(isDirty) {
+ if (currentEditor !== editor) return; // editor replaced
+ currentDirty = isDirty;
saveBtn.disabled = !isDirty || !canSave(node);
dirtyEl.textContent = isDirty ? '● modified' : '';
}
editor.on('change', async function () {
+ if (currentEditor !== editor) return; // switched away
var h = await hashContent(editor.getValue());
+ if (currentEditor !== editor) return; // replaced during await
markDirty(h !== initialHash);
});
+ // Adopt the new server ETag + refresh the dirty baseline after a
+ // successful write so save→edit→save doesn't false-conflict.
+ async function markSaved(content, res) {
+ if (currentEditor !== editor) return;
+ if (res && res.etag) currentEtag = res.etag;
+ initialHash = await hashContent(content);
+ if (currentEditor !== editor) return;
+ markDirty(false);
+ statusEl.textContent = 'Saved ' + new Date().toLocaleTimeString();
+ if (window.zddc && window.zddc.toast) {
+ window.zddc.toast('Saved ' + node.name, 'success');
+ }
+ }
+
+ // 412 → file changed on the server since load. Open the shared
+ // conflict dialog instead of clobbering.
+ async function resolveConflict(content) {
+ var conflict = window.app.modules.conflict;
+ var prev = window.app.modules.preview;
+ if (!conflict || !prev) return;
+ await conflict.open({
+ filename: node.name,
+ mineText: content,
+ fetchTheirs: function () {
+ return prev.getContentWithVersion(node).then(function (r) {
+ return new TextDecoder('utf-8', { fatal: false }).decode(r.buf);
+ });
+ },
+ onOverwrite: function () {
+ return prev.getContentWithVersion(node).then(function (cur) {
+ return saveContent(node, content, { etag: cur.etag, lastModified: cur.lastModified });
+ }).then(function (res) { return markSaved(content, res); });
+ },
+ onReload: function () {
+ markDirty(false);
+ currentDirty = false;
+ return prev.showFilePreview(node);
+ },
+ onSaveCopy: function () {
+ return util.saveCopy(node, content, 'application/x-yaml; charset=utf-8')
+ .then(function (name) {
+ if (window.zddc && window.zddc.toast) {
+ window.zddc.toast('Saved your version as ' + name, 'success');
+ }
+ });
+ }
+ });
+ if (currentEditor === editor) statusEl.textContent = '';
+ }
+
async function save() {
if (saveBtn.disabled) return;
// Re-check authority at click time, not via the mount-time
@@ -9777,14 +10974,17 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var content = editor.getValue();
try {
statusEl.textContent = 'Saving…';
- await saveContent(node, content);
- initialHash = await hashContent(content);
- markDirty(false);
- statusEl.textContent = 'Saved ' + new Date().toLocaleTimeString();
- if (window.zddc && window.zddc.toast) {
- window.zddc.toast('Saved ' + node.name, 'success');
- }
+ var res = await saveContent(node, content, {
+ etag: currentEtag, lastModified: currentLastModified
+ });
+ await markSaved(content, res);
} catch (e) {
+ if (e && e.status === 412) {
+ if (currentEditor !== editor) return;
+ statusEl.textContent = 'Conflict — resolving…';
+ await resolveConflict(content);
+ return;
+ }
statusEl.textContent = 'Save failed: ' + (e.message || e);
if (window.zddc && window.zddc.toast) {
window.zddc.toast('Save failed: ' + (e.message || e), 'error');
@@ -9809,7 +11009,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
window.app.modules.yamledit = {
handles: handles,
- render: render
+ render: render,
+ dispose: dispose,
+ isDirty: isDirty,
+ currentNode: currentNode
};
})();
@@ -9873,22 +11076,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
currentRow = null;
}
- // ── Formatting (kept local so this module is self-contained) ──
+ // ── Formatting ──
- function escapeHtml(s) {
- return String(s).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
- }
-
- function fmtSize(bytes) {
- if (bytes == null) return '';
- if (bytes < 1024) return bytes + ' B';
- if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
- if (bytes < 1024 * 1024 * 1024) {
- return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
- }
- return (bytes / (1024 * 1024 * 1024)).toFixed(2) + ' GB';
- }
+ var escapeHtml = window.app.modules.util.escapeHtml;
+ var fmtSize = window.app.modules.util.fmtSize;
function fmtDate(d) {
if (!d) return '';
@@ -9992,10 +11183,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
+ '…';
}
- // Path comes last (longest, most likely to wrap).
- var path = tree ? tree.pathFor(node) : '';
- if (path) html += kv('Path', path, true);
- if (node.url && node.url !== path) html += kv('URL', node.url, true);
+ // URL last (longest, most likely to wrap) — rendered as a clickable
+ // link the user can open or right-click to copy. The on-disk path is
+ // intentionally omitted; the URL is the shareable reference.
+ if (node.url) html += kvLink('URL', node.url, node.url);
return html;
}
@@ -10517,20 +11708,11 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (lastResolved) msg += ' — last at ' + lastResolved;
note(msg, 'success');
}
- // Reload the listing of the workflow folder so the new +Cn file
- // appears in the tree. The workflow folder is the parent of the
- // virtual `received/` (i.e., the URL with one `/received/`
- // suffix stripped).
- var refreshUrl = targetURL.replace(/\/received\/[^/]+\/?$/, '/');
+ // Reload the current listing so the new +Cn file appears in the
+ // tree. Best-effort.
try {
var ev = window.app.modules.events;
- if (ev && typeof ev.refreshListing === 'function') {
- ev.refreshListing();
- } else if (refreshUrl) {
- // Best-effort fallback: re-navigate to the workflow folder
- // so its listing is refreshed.
- // (No action — refreshListing absence implies older browse.)
- }
+ if (ev && typeof ev.refreshListing === 'function') ev.refreshListing();
} catch (_e) { /* refresh is best-effort */ }
}
@@ -10881,6 +12063,12 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
// Trigger a download from a same-origin server URL via Content-Disposition.
+ // NOTE: an click is fire-and-forget — a server error
+ // (401/403/404/5xx) can't be observed here, so failures surface only as
+ // the browser's own download error, not a toast. This is deliberate: the
+ // folder path points at zddc-server's streamed virtual ".zip"
+ // endpoint, and buffering it through fetch() to make errors catchable
+ // would defeat the streaming (the archive can be arbitrarily large).
function downloadUrl(filename, url) {
var a = document.createElement('a');
a.href = url;
@@ -10934,9 +12122,12 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var zip = new window.JSZip();
for (var i = 0; i < files.length; i++) {
ev.statusInfo('Zipping ' + rootHandle.name + '… (' + (i + 1) + '/' + files.length + ')');
+ // Hand JSZip the File (a Blob, backed by disk) rather than
+ // pre-reading every file's arrayBuffer — otherwise the whole
+ // tree's raw bytes sit in the JS heap at once before zipping.
+ // JSZip reads each Blob lazily during generateAsync.
var f = await files[i].handle.getFile();
- var buf = await f.arrayBuffer();
- zip.file(rootHandle.name + '/' + files[i].relPath, buf);
+ zip.file(rootHandle.name + '/' + files[i].relPath, f);
}
ev.statusInfo('Generating ' + rootHandle.name + '.zip…');
var blob = await zip.generateAsync({ type: 'blob' });
@@ -11011,9 +12202,36 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
}
+ // Export a file converted to another format. Server-only: builds the
+ // sibling-extension URL (foo.docx → foo.md) and lets the browser pull it —
+ // zddc-server recognises the virtual path and converts on the fly, emitting
+ // Content-Disposition. fmt is a bare extension ("md" | "docx" | "html").
+ function exportFile(node, fmt) {
+ if (!node || node.isDir) {
+ events().statusError('Not a file: ' + (node && node.name));
+ return;
+ }
+ if (state.source !== 'server') {
+ events().statusError('Export to .' + fmt + ' needs a server connection');
+ return;
+ }
+ var tree = window.app.modules.tree;
+ var path = tree && tree.pathFor ? tree.pathFor(node) : node.url;
+ if (!path) {
+ events().statusError('No path for ' + node.name);
+ return;
+ }
+ var url = path.replace(/\.[^./]+$/, '') + '.' + fmt;
+ var name = node.name.replace(/\.[^./]+$/, '') + '.' + fmt;
+ events().statusInfo('Exporting ' + name + '…');
+ downloadUrl(name, url);
+ setTimeout(function () { events().statusClear(); }, 2500);
+ }
+
window.app.modules.download = {
downloadFile: downloadFile,
- downloadFolder: downloadFolder
+ downloadFolder: downloadFolder,
+ exportFile: exportFile
};
})();
@@ -11064,44 +12282,18 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
}
- // Compute today + N days as a YYYY-MM-DD string.
- function isoDatePlus(days) {
- var d = new Date();
- d.setDate(d.getDate() + days);
- var y = d.getFullYear();
- var m = ('0' + (d.getMonth() + 1)).slice(-2);
- var dd = ('0' + d.getDate()).slice(-2);
- return y + '-' + m + '-' + dd;
- }
+ var util = window.app.modules.util;
+ var isoDatePlus = util.isoDatePlus;
// Fetch suggestion emails from /.profile/access so the originator
// field has a datalist of likely values. Best-effort — silent on
// failure (the field still accepts free text).
- async function fetchOriginatorSuggestions() {
- try {
- var resp = await fetch('/.profile/access', {
- headers: { 'Accept': 'application/json' },
- credentials: 'same-origin'
- });
- if (!resp.ok) return [];
- var data = await resp.json();
- var out = [];
- // The endpoint exposes the current user + any role members
- // visible to them. Pull anything that looks like an email
- // for the datalist; the field is otherwise free text.
- if (data && data.email) out.push(data.email);
- return out;
- } catch (_e) {
- return [];
- }
- }
+ var fetchOriginatorSuggestions = util.fetchAccessEmails;
// Build the YAML body for the plan-review POST. Quoting is minimal
// (just enough for emails with special chars).
function buildBody(values) {
- function yamlString(s) {
- return '"' + String(s).replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
- }
+ var yamlString = util.yamlQuote;
return [
'review_lead: ' + yamlString(values.reviewLead),
'approver: ' + yamlString(values.approver),
@@ -11164,7 +12356,14 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
});
});
+ // Escape handler bound once, removed in close() — every
+ // dismissal path routes through close() so the document
+ // listener never outlives the modal.
+ function onKeydown(e) {
+ if (e.key === 'Escape') { close(); reject(new Error('cancelled')); }
+ }
function close() {
+ document.removeEventListener('keydown', onKeydown);
if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
}
@@ -11178,13 +12377,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
reject(new Error('cancelled'));
}
});
- document.addEventListener('keydown', function escHandler(e) {
- if (e.key === 'Escape') {
- document.removeEventListener('keydown', escHandler);
- close();
- reject(new Error('cancelled'));
- }
- });
+ document.addEventListener('keydown', onKeydown);
box.querySelector('#pr-submit').addEventListener('click', function () {
var values = {
@@ -11206,14 +12399,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
});
}
- function escapeHtml(s) {
- return String(s).replace(/[&<>"']/g, function (c) {
- return ({
- '&': '&', '<': '<', '>': '>',
- '"': '"', "'": '''
- })[c];
- });
- }
+ var escapeHtml = util.escapeHtml;
// Detect whether a tree node is an archive//received//
// folder. The path is path-shaped, not content-based — tracking-number
@@ -11230,8 +12416,11 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
&& parts[3].toLowerCase() === 'received';
}
+ var busy = false;
+
// Run the Plan Review flow: open the modal, POST the result.
async function invoke(node) {
+ if (busy) return;
var tree = window.app.modules.tree;
if (!tree) return;
var url = tree.pathFor(node);
@@ -11246,43 +12435,48 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return; // cancelled
}
- statusInfo('Plan Review — submitting…');
- var body = buildBody(values);
- var resp;
+ busy = true;
try {
- resp = await fetch(url, {
- method: 'POST',
- headers: {
- 'X-ZDDC-Op': 'plan-review',
- 'Content-Type': 'application/yaml'
- },
- body: body,
- credentials: 'same-origin'
- });
- } catch (e) {
- statusError('Plan Review failed: ' + (e && e.message ? e.message : e));
- return;
- }
- if (!resp.ok) {
- var text = '';
- try { text = await resp.text(); } catch (_e) { /* ignore */ }
- statusError('Plan Review failed (' + resp.status + '): ' + text);
- return;
- }
- var data;
- try { data = await resp.json(); } catch (_e) { data = null; }
- if (data && data.reviewing && data.staging) {
- var rPart = data.reviewing.created ? 'created' : 'updated';
- var sPart = data.staging.created ? 'created' : 'updated';
- var seal = (data.received && data.received.created)
- ? ' Canonical record sealed.'
- : (data.received && !data.received.zddc_written)
- ? ' Canonical dates left untouched (already sealed).'
- : '';
- statusInfo('Plan Review: reviewing ' + rPart + ', staging ' + sPart + '.' + seal +
- ' Reload the relevant folder to see the new entries.');
- } else {
- statusInfo('Plan Review complete.');
+ statusInfo('Plan Review — submitting…');
+ var body = buildBody(values);
+ var resp;
+ try {
+ resp = await fetch(url, {
+ method: 'POST',
+ headers: {
+ 'X-ZDDC-Op': 'plan-review',
+ 'Content-Type': 'application/yaml'
+ },
+ body: body,
+ credentials: 'same-origin'
+ });
+ } catch (e) {
+ statusError('Plan Review failed: ' + (e && e.message ? e.message : e));
+ return;
+ }
+ if (!resp.ok) {
+ var text = '';
+ try { text = await resp.text(); } catch (_e) { /* ignore */ }
+ statusError('Plan Review failed (' + resp.status + '): ' + text);
+ return;
+ }
+ var data;
+ try { data = await resp.json(); } catch (_e) { data = null; }
+ if (data && data.reviewing && data.staging) {
+ var rPart = data.reviewing.created ? 'created' : 'updated';
+ var sPart = data.staging.created ? 'created' : 'updated';
+ var seal = (data.received && data.received.created)
+ ? ' Canonical record sealed.'
+ : (data.received && !data.received.zddc_written)
+ ? ' Canonical dates left untouched (already sealed).'
+ : '';
+ statusInfo('Plan Review: reviewing ' + rPart + ', staging ' + sPart + '.' + seal +
+ ' Reload the relevant folder to see the new entries.');
+ } else {
+ statusInfo('Plan Review complete.');
+ }
+ } finally {
+ busy = false;
}
}
@@ -11319,28 +12513,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (t) t(msg, level || 'info');
}
- function isoDateToday() {
- var d = new Date();
- return d.getFullYear()
- + '-' + ('0' + (d.getMonth() + 1)).slice(-2)
- + '-' + ('0' + d.getDate()).slice(-2);
- }
- function isoDatePlus(days) {
- var d = new Date();
- d.setDate(d.getDate() + days);
- return d.getFullYear()
- + '-' + ('0' + (d.getMonth() + 1)).slice(-2)
- + '-' + ('0' + d.getDate()).slice(-2);
- }
-
- function escapeHtml(s) {
- return String(s).replace(/[&<>"']/g, function (c) {
- return ({
- '&': '&', '<': '<', '>': '>',
- '"': '"', "'": '''
- })[c];
- });
- }
+ var util = window.app.modules.util;
+ var escapeHtml = util.escapeHtml;
+ var isoDateToday = util.isoDateToday;
+ var isoDatePlus = util.isoDatePlus;
// Is this node a direct child of an incoming/ canonical folder
// AND a well-formed transmittal folder? The first half is the
@@ -11390,19 +12566,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return out;
}
- function fetchPeopleSuggestions() {
- return fetch('/.profile/access', {
- headers: { 'Accept': 'application/json' },
- credentials: 'same-origin'
- }).then(function (r) {
- if (!r.ok) return [];
- return r.json().then(function (data) {
- var out = [];
- if (data && data.email) out.push(data.email);
- return out;
- });
- }).catch(function () { return []; });
- }
+ var fetchPeopleSuggestions = util.fetchAccessEmails;
function openForm(initial) {
return new Promise(function (resolve, reject) {
@@ -11483,7 +12647,15 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
});
});
+ // Bind the Escape handler once and remove it in close() — every
+ // dismissal path (cancel, overlay-click, submit, Escape) routes
+ // through close(), so the document listener can't outlive the
+ // modal.
+ function onKeydown(e) {
+ if (e.key === 'Escape') { close(); reject(new Error('cancelled')); }
+ }
function close() {
+ document.removeEventListener('keydown', onKeydown);
if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
}
box.querySelector('#acc-cancel').addEventListener('click', function () {
@@ -11492,12 +12664,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
overlay.addEventListener('click', function (e) {
if (e.target === overlay) { close(); reject(new Error('cancelled')); }
});
- document.addEventListener('keydown', function escHandler(e) {
- if (e.key === 'Escape') {
- document.removeEventListener('keydown', escHandler);
- close(); reject(new Error('cancelled'));
- }
- });
+ document.addEventListener('keydown', onKeydown);
box.querySelector('#acc-submit').addEventListener('click', function () {
var values = {
@@ -11521,9 +12688,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
});
}
- function quote(s) {
- return '"' + String(s).replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
- }
+ var quote = util.yamlQuote;
function buildBody(values) {
var lines = ['received_date: ' + values.receivedDate];
if (values.setupPlanReview) {
@@ -11537,7 +12702,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return lines.join('\n');
}
+ var busy = false;
+
async function invoke(node) {
+ if (busy) return;
var tree = window.app.modules.tree;
if (!tree) return;
var url = tree.pathFor(node);
@@ -11569,34 +12737,43 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return;
}
- status('Accept Transmittal — submitting…');
- var resp;
+ busy = true;
try {
- resp = await fetch(url, {
- method: 'POST',
- headers: {
- 'X-ZDDC-Op': 'accept-transmittal',
- 'Content-Type': 'application/yaml'
- },
- body: buildBody(values),
- credentials: 'same-origin'
- });
- } catch (e) {
- status('Accept failed: ' + (e && e.message ? e.message : e), 'error');
- return;
+ status('Accept Transmittal — submitting…');
+ var resp;
+ try {
+ resp = await fetch(url, {
+ method: 'POST',
+ headers: {
+ 'X-ZDDC-Op': 'accept-transmittal',
+ 'Content-Type': 'application/yaml'
+ },
+ body: buildBody(values),
+ credentials: 'same-origin'
+ });
+ } catch (e) {
+ status('Accept failed: ' + (e && e.message ? e.message : e), 'error');
+ return;
+ }
+ if (!resp.ok) {
+ var text = '';
+ try { text = await resp.text(); } catch (_e) { /* ignore */ }
+ status('Accept failed (' + resp.status + '): ' + text, 'error');
+ return;
+ }
+ var data; try { data = await resp.json(); } catch (_e) { data = null; }
+ var msg = 'Accepted ' + (data && data.moved_files ? data.moved_files : '?') + ' file(s) into '
+ + (data && data.received_path ? data.received_path : 'received/');
+ if (data && data.merged) msg += ' (merged with existing tracking)';
+ if (data && data.plan_review) msg += ' · Plan Review scaffolded';
+ status(msg, 'success');
+ // Refresh the incoming/ listing so the now-moved folder drops out
+ // of the tree — the stale entry was the main re-trigger hazard.
+ var ev = window.app.modules.events;
+ if (ev && typeof ev.refreshListing === 'function') ev.refreshListing();
+ } finally {
+ busy = false;
}
- if (!resp.ok) {
- var text = '';
- try { text = await resp.text(); } catch (_e) { /* ignore */ }
- status('Accept failed (' + resp.status + '): ' + text, 'error');
- return;
- }
- var data; try { data = await resp.json(); } catch (_e) { data = null; }
- var msg = 'Accepted ' + (data && data.moved_files ? data.moved_files : '?') + ' file(s) into '
- + (data && data.received_path ? data.received_path : 'received/');
- if (data && data.merged) msg += ' (merged with existing tracking)';
- if (data && data.plan_review) msg += ' · Plan Review scaffolded';
- status(msg + ' — reload to see the move.', 'success');
}
window.app.modules.acceptTransmittal = {
@@ -11632,11 +12809,16 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var t = window.zddc && window.zddc.toast;
if (t) t(msg, level || 'info');
}
- function escapeHtml(s) {
- return String(s).replace(/[&<>"']/g, function (c) {
- return ({ '&':'&','<':'<','>':'>','"':'"',"'":''' })[c];
- });
+ // Re-fetch the current listing so the moved file appears/disappears
+ // without a manual reload. Best-effort: absent on older builds.
+ function refreshListing() {
+ var ev = window.app.modules.events;
+ if (ev && typeof ev.refreshListing === 'function') ev.refreshListing();
}
+ // Guard against a second invocation while a move is mid-flight (e.g. a
+ // double menu click). The picker modal also blocks re-entry while open.
+ var busy = false;
+ var escapeHtml = window.app.modules.util.escapeHtml;
// ── Scope detection: path-shape, not cascade-content ──────────────
// A file is stageable if its path matches
@@ -11697,18 +12879,6 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
.map(function (e) { return e.name; });
}
- async function fetchSelfEmail() {
- try {
- var r = await fetch('/.profile/access', {
- headers: { 'Accept': 'application/json' },
- credentials: 'same-origin'
- });
- if (!r.ok) return '';
- var d = await r.json();
- return (d && d.email) || '';
- } catch (_e) { return ''; }
- }
-
// POST X-ZDDC-Op: mkdir to create a new directory. Idempotent.
async function mkdir(absUrl) {
var resp = await fetch(absUrl, {
@@ -11874,6 +13044,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// ── Action drivers ─────────────────────────────────────────────────
async function invokeStage(node) {
+ if (busy) return;
var tree = window.app.modules.tree;
if (!tree) return;
var srcUrl = tree.pathFor(node);
@@ -11896,26 +13067,46 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
choice = await openStagePicker({ fileCount: 1, folders: folders });
} catch (_e) { return; }
- if (choice.create) {
+ busy = true;
+ try {
+ // Stage is a non-atomic mkdir-then-move (no single composite op).
+ // Track whether the folder was freshly created so that, if the
+ // move then fails, we can tell the user the folder exists but the
+ // file didn't make it — otherwise an empty folder appears with a
+ // generic "move failed" and no explanation.
+ var createdFolder = false;
+ if (choice.create) {
+ try {
+ await mkdir(stagingBase + encodeURIComponent(choice.folderName) + '/');
+ createdFolder = true;
+ } catch (e) {
+ status((e && e.message) || 'mkdir failed', 'error');
+ return;
+ }
+ }
+
+ var dstUrl = stagingBase + encodeURIComponent(choice.folderName) + '/' + encodeURIComponent(node.name);
try {
- await mkdir(stagingBase + encodeURIComponent(choice.folderName) + '/');
+ await moveFile(srcUrl, dstUrl);
} catch (e) {
- status((e && e.message) || 'mkdir failed', 'error');
+ var msg = (e && e.message) || 'move failed';
+ if (createdFolder) {
+ msg += ' — the new folder "' + choice.folderName
+ + '" was created but ' + node.name + ' was not moved into it.';
+ }
+ status(msg, 'error');
+ refreshListing(); // surface the (possibly empty) new folder
return;
}
+ status('Staged ' + node.name + ' → ' + info.party + '/staging/' + choice.folderName + '/', 'success');
+ refreshListing();
+ } finally {
+ busy = false;
}
-
- var dstUrl = stagingBase + encodeURIComponent(choice.folderName) + '/' + encodeURIComponent(node.name);
- try {
- await moveFile(srcUrl, dstUrl);
- } catch (e) {
- status((e && e.message) || 'move failed', 'error');
- return;
- }
- status('Staged ' + node.name + ' → ' + info.party + '/staging/' + choice.folderName + '/ — reload to see the move.', 'success');
}
async function invokeUnstage(node) {
+ if (busy) return;
var tree = window.app.modules.tree;
if (!tree) return;
var srcUrl = tree.pathFor(node);
@@ -11933,13 +13124,19 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var target = choice.target;
if (!target.endsWith('/')) target += '/';
var dstUrl = target + encodeURIComponent(node.name);
+ busy = true;
try {
- await moveFile(srcUrl, dstUrl);
- } catch (e) {
- status((e && e.message) || 'move failed', 'error');
- return;
+ try {
+ await moveFile(srcUrl, dstUrl);
+ } catch (e) {
+ status((e && e.message) || 'move failed', 'error');
+ return;
+ }
+ status('Unstaged ' + node.name + ' → ' + target, 'success');
+ refreshListing();
+ } finally {
+ busy = false;
}
- status('Unstaged ' + node.name + ' → ' + target + ' — reload to see the move.', 'success');
}
window.app.modules.stage = {
@@ -11968,11 +13165,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
(function () {
'use strict';
- function escapeHtml(s) {
- return String(s == null ? '' : s)
- .replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
- }
+ var escapeHtml = window.app.modules.util.escapeHtml;
function toast(msg, kind) {
if (window.zddc && typeof window.zddc.toast === 'function') {
@@ -11992,12 +13185,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return d.toLocaleString();
}
- function fmtBytes(n) {
- if (n == null) return '';
- if (n < 1024) return n + ' B';
- if (n < 1024 * 1024) return (n / 1024).toFixed(1) + ' KB';
- return (n / (1024 * 1024)).toFixed(1) + ' MB';
- }
+ var fmtBytes = window.app.modules.util.fmtSize;
// Can the principal write (restore) to this file? Mirrors the
// events.js Rename/Delete gating: verbs===undefined means a non-zddc
@@ -12298,6 +13486,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (!confirm('Restore the version from ' + fmtTime(ent.ts) + '?\nThis is saved as a new version — nothing is lost.')) {
return;
}
+ // The restore itself (the PUT) is the operation that can "fail".
+ // Keep it in its own try so a later error while refreshing the UI
+ // can't surface a misleading "Restore failed" after the restore has
+ // already been persisted.
try {
var text = await fetchVersion(node, ent.id);
var resp = await fetch(node.url, {
@@ -12307,18 +13499,22 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
body: text
});
if (!resp.ok) throw new Error('HTTP ' + resp.status);
- toast('Restored version from ' + fmtTime(ent.ts), 'success');
- // Reflect the new head: refetch the list.
+ } catch (e) {
+ toast('Restore failed: ' + (e.message || e), 'error');
+ return;
+ }
+ toast('Restored version from ' + fmtTime(ent.ts), 'success');
+ // Best-effort UI refresh — the restore already succeeded, so a
+ // failure here is logged but never reported as a restore failure.
+ try {
var entries = await fetchList(node);
renderList(modal, node, entries);
// If the file is open in the preview pane, reload it.
var preview = window.app && window.app.modules && window.app.modules.preview;
if (preview && typeof preview.showFilePreview === 'function') {
- try { preview.showFilePreview(node); } catch (_e) { /* best effort */ }
+ preview.showFilePreview(node);
}
- } catch (e) {
- toast('Restore failed: ' + (e.message || e), 'error');
- }
+ } catch (_e) { /* refresh is best-effort; restore is done */ }
}
// ── Entry point ─────────────────────────────────────────────────────
@@ -12367,17 +13563,9 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var t = window.zddc && window.zddc.toast;
if (t) t(msg, level || 'info');
}
- function escapeHtml(s) {
- return String(s).replace(/[&<>"']/g, function (c) {
- return ({ '&':'&','<':'<','>':'>','"':'"',"'":''' })[c];
- });
- }
- function isoDateToday() {
- var d = new Date();
- return d.getFullYear()
- + '-' + ('0' + (d.getMonth() + 1)).slice(-2)
- + '-' + ('0' + d.getDate()).slice(-2);
- }
+ var util = window.app.modules.util;
+ var escapeHtml = util.escapeHtml;
+ var isoDateToday = util.isoDateToday;
function openForm() {
return new Promise(function (resolve, reject) {
@@ -12427,19 +13615,22 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
input.addEventListener('input', revalidate);
revalidate();
- function close() { if (overlay.parentNode) overlay.parentNode.removeChild(overlay); }
+ // Escape handler bound once, removed in close() so it can't
+ // outlive a modal dismissed via cancel / overlay-click / submit.
+ function onKeydown(e) {
+ if (e.key === 'Escape') { close(); reject(new Error('cancelled')); }
+ }
+ function close() {
+ document.removeEventListener('keydown', onKeydown);
+ if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
+ }
box.querySelector('#ct-cancel').addEventListener('click', function () {
close(); reject(new Error('cancelled'));
});
overlay.addEventListener('click', function (e) {
if (e.target === overlay) { close(); reject(new Error('cancelled')); }
});
- document.addEventListener('keydown', function escHandler(e) {
- if (e.key === 'Escape') {
- document.removeEventListener('keydown', escHandler);
- close(); reject(new Error('cancelled'));
- }
- });
+ document.addEventListener('keydown', onKeydown);
submit.addEventListener('click', function () {
var v = input.value.trim();
var parsed = window.zddc.parseFolder(v);
@@ -12584,6 +13775,21 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
refresh.classList.add('hidden');
}
}
+ // Toolbar New buttons: enabled when there's a writable target, and in
+ // server mode greyed (with a why-tooltip) when the scope lacks the
+ // create verb. Mirrors the menu's create-gate.
+ var canCreate = canCreateHere();
+ var lacksCreateVerb = state.source === 'server'
+ && state.scopeAccess && typeof state.scopeAccess.path_verbs === 'string'
+ && state.scopeAccess.path_verbs.indexOf('c') === -1;
+ ['newFolderBtn', 'newFileBtn'].forEach(function (id) {
+ var b = document.getElementById(id);
+ if (!b) return;
+ var off = !canCreate || lacksCreateVerb;
+ b.disabled = off;
+ b.title = lacksCreateVerb ? 'You don’t have create access here.'
+ : (!canCreate ? 'Open a folder to create files here.' : '');
+ });
}
// syncURLToSelection reflects the current scope + selected node +
@@ -12629,6 +13835,16 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
} catch (_e) { /* private browsing edge cases */ }
}
+ // Navigation sequence token. Every async flow that ends by replacing
+ // the tree root (refresh, rescope, reload, back/forward popstate)
+ // captures a token before its fetch and bails if a newer navigation
+ // has started by the time it resolves — otherwise a slow listing can
+ // land on top of a newer one and leave the tree out of sync with
+ // state.currentPath / the URL bar.
+ var navSeq = 0;
+ function beginNav() { return ++navSeq; }
+ function isCurrentNav(seq) { return seq === navSeq; }
+
async function refreshListing() {
// Snapshot expanded paths + selection BEFORE setRoot clears the
// tree, then re-apply after the new root is in place. Keeps
@@ -12637,6 +13853,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// a refresh — including the auto-refresh triggered by the
// "Show hidden files" toggle.
var snap = tree.snapshotState();
+ var seq = beginNav();
if (state.source === 'server') {
var raw;
try {
@@ -12645,9 +13862,12 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
statusError('Refresh failed: ' + e.message);
return;
}
+ if (!isCurrentNav(seq)) return;
tree.setRoot(raw);
await tree.restoreState(snap);
+ if (!isCurrentNav(seq)) return;
tree.render();
+ prefetchScopeAccess();
statusInfo('Refreshed (' + raw.length + ' item'
+ (raw.length === 1 ? '' : 's') + ')');
} else if (state.source === 'fs' && state.rootHandle) {
@@ -12658,14 +13878,33 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
statusError('Refresh failed: ' + e.message);
return;
}
+ if (!isCurrentNav(seq)) return;
tree.setRoot(raw2);
await tree.restoreState(snap);
+ if (!isCurrentNav(seq)) return;
tree.render();
statusInfo('Refreshed');
}
}
function init() {
+ // Inject the action implementations the declarative menu-model
+ // delegates to (avoids an events ↔ menu-model circular dependency).
+ var mm = window.app.modules.menuModel;
+ if (mm && mm.configure) {
+ mm.configure({
+ createInDir: createInDir,
+ renameNode: renameNode,
+ deleteNode: deleteNode,
+ navigateIntoFolder: navigateIntoFolder,
+ refreshListing: refreshListing,
+ parentDirFor: parentDirFor,
+ canCreateHere: canCreateHere,
+ statusInfo: statusInfo,
+ statusError: statusError
+ });
+ }
+
// Header buttons
var btn = document.getElementById('addDirectoryBtn');
if (btn) btn.addEventListener('click', pickLocalDir);
@@ -12673,6 +13912,37 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var refresh = document.getElementById('refreshHeaderBtn');
if (refresh) refresh.addEventListener('click', refreshListing);
+ // ── Tree-pane toolbar: New folder / New file, Sort, Show hidden ──
+ // View settings live on the toolbar (not in per-row right-click
+ // menus); create has a discoverable affordance here now that file
+ // rows no longer offer it.
+ var newFolderBtn = document.getElementById('newFolderBtn');
+ if (newFolderBtn) newFolderBtn.addEventListener('click', function () {
+ createInDir(state.currentPath || '/', 'folder');
+ });
+ var newFileBtn = document.getElementById('newFileBtn');
+ if (newFileBtn) newFileBtn.addEventListener('click', function () {
+ createInDir(state.currentPath || '/', 'markdown');
+ });
+ var sortSelect = document.getElementById('sortSelect');
+ if (sortSelect) {
+ // Reflect current state, then drive setSortExplicit on change.
+ sortSelect.value = state.sort.key + ':' + state.sort.dir;
+ sortSelect.addEventListener('change', function () {
+ var parts = sortSelect.value.split(':');
+ tree.setSortExplicit(parts[0], parseInt(parts[1], 10) === -1 ? -1 : 1);
+ });
+ }
+ var showHiddenChk = document.getElementById('showHiddenChk');
+ if (showHiddenChk) {
+ showHiddenChk.checked = !!state.showHidden;
+ showHiddenChk.addEventListener('change', function () {
+ state.showHidden = showHiddenChk.checked;
+ syncURLToSelection();
+ refreshListing();
+ });
+ }
+
// Tree autofilter — parses input through zddc.filter.parse so
// the same query grammar that the archive app uses (terms,
// quotes, !negation, multi-word AND) works here. The AST is
@@ -12767,6 +14037,16 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
treeBody.addEventListener('click', function (e) {
var row = e.target.closest('.tree-row');
if (!row) return;
+ // Kebab (⋯) button → open the row menu at the button; must run
+ // BEFORE the toggle/preview logic so it doesn't also fire those.
+ var kebab = e.target.closest('.tree-row__kebab');
+ if (kebab) {
+ e.preventDefault();
+ e.stopPropagation();
+ var r = kebab.getBoundingClientRect();
+ openRowMenuFor(row, r.right, r.bottom);
+ return;
+ }
var id = parseInt(row.dataset.id, 10);
var node = state.nodes.get(id);
if (!node) return;
@@ -12863,6 +14143,22 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// if collapsed/leaf
// Enter / Space — preview file / toggle folder
// Home / End — first / last visible row
+ // Keyboard menu key — ContextMenu key or Shift+F10 opens the row
+ // menu at the selected row (standard file-manager / a11y gesture).
+ document.addEventListener('keydown', function (e) {
+ var tag = (e.target && e.target.tagName) || '';
+ if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return;
+ if (e.target && e.target.isContentEditable) return;
+ if (document.querySelector('.modal-overlay, .zddc-menu')) return;
+ var isMenuKey = e.key === 'ContextMenu' || (e.shiftKey && e.key === 'F10');
+ if (!isMenuKey || state.selectedId == null) return;
+ var selRow = treeBody.querySelector('.tree-row[data-id="' + state.selectedId + '"]');
+ if (!selRow) return;
+ e.preventDefault();
+ var rr = selRow.getBoundingClientRect();
+ openRowMenuFor(selRow, rr.left + 16, rr.bottom - 4);
+ });
+
document.addEventListener('keydown', function (e) {
// Skip editable contexts.
var tag = (e.target && e.target.tagName) || '';
@@ -12945,7 +14241,10 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// selection-only; their preview is "expand to see inside".
if (nextNode && !nextNode.isDir && !nextNode.isZip
&& previewModule) {
- previewModule.showFilePreview(nextNode);
+ // auto:true — keyboard cursor walking the tree. If an
+ // editor has unsaved edits, the preview module leaves it
+ // in place rather than prompting on every keystroke.
+ previewModule.showFilePreview(nextNode, { auto: true });
state.lastPreviewedNodeId = nextId;
}
// Scroll the now-selected row into view.
@@ -12961,27 +14260,8 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
treeBody.addEventListener('contextmenu', function (e) {
e.preventDefault();
var row = e.target.closest('.tree-row');
- if (row) {
- var id = parseInt(row.dataset.id, 10);
- var node = state.nodes.get(id);
- if (!node) return;
- state.selectedId = id;
- tree.render();
- syncURLToSelection();
- window.zddc.menu.open({
- x: e.clientX,
- y: e.clientY,
- context: { node: node, row: row },
- items: buildTreeRowMenu
- });
- } else {
- window.zddc.menu.open({
- x: e.clientX,
- y: e.clientY,
- context: { dir: state.currentPath || '/' },
- items: buildPaneMenu
- });
- }
+ if (row) openRowMenuFor(row, e.clientX, e.clientY);
+ else openPaneMenu(e.clientX, e.clientY);
});
// Per-row drag-drop. Any row is a drop target — folders
@@ -13156,11 +14436,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return parentDir;
}
- function escapeHtml(s) {
- return String(s).replace(/[&<>"']/g, function (c) {
- return ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[c];
- });
- }
+ var escapeHtml = window.app.modules.util.escapeHtml;
// Valid party folder name — mirrors zddc.ValidPartyName server-side
// (^[A-Za-z0-9][A-Za-z0-9.-]*$).
@@ -13356,7 +14632,6 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
}
- function createInside(node, kind) { return createInDir(parentDirFor(node), kind); }
// Reload a directory's children in the tree so a create/delete/
// rename is reflected. Works for both the current scope (root)
@@ -13365,14 +14640,20 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var loader = window.app.modules.loader;
if (!loader) return;
if (!dirPath.endsWith('/')) dirPath += '/';
+ var seq = beginNav();
// Root-scope reload — refresh the visible top-level listing.
if (dirPath === state.currentPath) {
+ var es;
try {
- var es = state.source === 'server'
+ es = state.source === 'server'
? await loader.fetchServerChildren(dirPath)
: (state.rootHandle ? await loader.fetchFsChildren(state.rootHandle) : []);
- tree.setRoot(es);
- } catch (_e) { /* swallow */ }
+ } catch (e) {
+ statusError('Reload failed: ' + (e.message || e));
+ return;
+ }
+ if (!isCurrentNav(seq)) return;
+ tree.setRoot(es);
tree.render();
return;
}
@@ -13384,13 +14665,18 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
if (tree.pathFor(n).replace(/\/$/, '') === noSlash) hit = n;
});
if (hit) {
+ var raw;
try {
- var raw = state.source === 'server'
+ raw = state.source === 'server'
? await loader.fetchServerChildren(dirPath)
: (hit.handle ? await loader.fetchFsChildren(hit.handle) : []);
- tree.setChildren(hit.id, raw);
- hit.expanded = true;
- } catch (_e) { /* swallow */ }
+ } catch (e) {
+ statusError('Reload failed: ' + (e.message || e));
+ return;
+ }
+ if (!isCurrentNav(seq)) return;
+ tree.setChildren(hit.id, raw);
+ hit.expanded = true;
tree.render();
}
}
@@ -13458,42 +14744,6 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
}
- // Shared submenu (used by both the row menu and the pane menu).
- // Toggle items so the active sort is checked in both surfaces.
- var SORT_BY_ITEMS = [
- { label: 'Name',
- checked: function () { return state.sort.key === 'name'; },
- action: function () { tree.setSortExplicit('name', 1); } },
- { label: 'Modified',
- checked: function () { return state.sort.key === 'date'; },
- action: function () { tree.setSortExplicit('date', -1); } },
- { label: 'Size',
- checked: function () { return state.sort.key === 'size'; },
- action: function () { tree.setSortExplicit('size', -1); } },
- { label: 'Type',
- checked: function () { return state.sort.key === 'ext'; },
- action: function () { tree.setSortExplicit('ext', 1); } }
- ];
-
- // Row context menu — traditional file-manager layout:
- // Open / Open in new tab / Pop out preview
- // ─
- // Download (label flips on type)
- // ─
- // New folder / New markdown file
- // ─
- // Rename / Delete (permission-gated, disabled
- // when the row can't be mutated)
- // ─
- // Copy path / Copy name
- // ─
- // Expand / Collapse / Navigate into
- // ─
- // Sort by … / Show hidden files
- //
- // Items are kept VISIBLE but DISABLED when they don't apply, so
- // every menu has the same shape regardless of what the user
- // right-clicked. Predictable position = muscle memory.
// canCreateHere — whether New folder/file has a writable target: the
// server (ACL decides the rest) or a picked local folder (the
// filesystem permission decides, escalated on first write).
@@ -13501,316 +14751,65 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
return state.source === 'server' || (state.source === 'fs' && !!state.rootHandle);
}
- function buildTreeRowMenu(ctx) {
- var serverMode = state.source === 'server';
- var canMutate = function (c) {
- var up = window.app.modules.upload;
- return !!(up && up.canMutate(c.node));
- };
- return [
- // ── Open / preview cluster ──
- {
- label: function (c) {
- if (c.node.isDir) return 'Open';
- if (c.node.isZip) return 'Open archive';
- return 'Preview';
- },
- disabled: function (c) { return !!c.node.virtual; },
- action: function (c) {
- if (c.node.isDir || c.node.isZip) {
- tree.toggleFolder(c.node.id);
- } else {
- var p = previewMod();
- if (p) p.showFilePreview(c.node);
- }
- }
- },
- {
- label: 'Open in new tab',
- accel: 'Ctrl+Click',
- disabled: function (c) { return !c.node.url; },
- action: function (c) {
- if (c.node.url) window.open(c.node.url, '_blank', 'noopener');
- }
- },
- {
- label: 'Pop out preview',
- disabled: function (c) { return c.node.isDir || c.node.isZip; },
- action: function (c) {
- var p = previewMod();
- if (p) p.showFilePreview(c.node, { popup: true });
- }
- },
- { separator: true },
+ // ── Menu opening (row / pane / kebab / keyboard) ──────────────────────
+ // The menu CONTENTS come from the declarative menu-model; this layer just
+ // resolves the target, syncs selection, and positions the menu. All four
+ // entry points (right-click row, right-click pane, kebab button, keyboard
+ // menu key) funnel through here so they stay identical.
- // ── Download (single item; label flips on type) ──
- {
- label: function (c) { return c.node.isDir ? 'Download ZIP' : 'Download'; },
- icon: '⤓',
- disabled: function (c) { return !!c.node.virtual; },
- action: function (c) {
- var d = window.app.modules.download;
- if (!d) return;
- if (c.node.isDir) d.downloadFolder(c.node);
- else d.downloadFile(c.node);
- }
- },
- { separator: true },
+ // The prefetched /.profile/access view for the current scope (set on every
+ // listing load — see prefetchScopeAccess). Returned synchronously; the
+ // menu never triggers a fetch at open time. null until prefetched / FS mode.
+ function prefetchedAccess() { return state.scopeAccess; }
- // ── Create new (in the row's parent folder) ──
- {
- label: 'New folder',
- disabled: !canCreateHere(),
- action: function (c) { createInside(c.node, 'folder'); }
- },
- {
- label: 'New markdown file',
- disabled: !canCreateHere(),
- action: function (c) { createInside(c.node, 'markdown'); }
- },
- { separator: true },
+ function menuModel() { return window.app.modules.menuModel; }
- // ── Rename + Delete (the permission-gated pair) ──
- //
- // Two gates compose: canMutate() rules out un-writable
- // sources (offline FS-API without a handle, zip members,
- // virtual placeholders) and — when the listing carries
- // server-cascade verbs — zddc.cap.has(node, verb) applies
- // the per-entry ACL. The verbs gate is server-mode only;
- // file:// FS-API and plain Caddy listings have no verbs
- // field, so we fall back to canMutate alone (FS-API
- // enforces locally; Caddy has no PUT/DELETE either way).
- // Server-side ACL still has the final say on the actual
- // PUT/DELETE if a stale client tries the action.
- {
- label: 'Rename…',
- disabled: function (c) {
- if (!canMutate(c)) return true;
- if (!serverMode || !window.zddc.cap) return false;
- // verbs===undefined → Caddy or other non-zddc
- // server, no cascade signal to gate on. verbs===""
- // is zddc-server's explicit zero grant; still
- // gate (disable). verbs==="rw…" → check the bit.
- if (typeof c.node.verbs !== 'string') return false;
- return !window.zddc.cap.has(c.node, 'w');
- },
- tooltip: function (c) {
- if (!serverMode || !canMutate(c)) return '';
- if (!window.zddc.cap) return '';
- if (typeof c.node.verbs !== 'string') return '';
- if (window.zddc.cap.has(c.node, 'w')) return '';
- return "You don't have write access to this item.";
- },
- action: function (c) { renameNode(c.node); }
- },
- {
- label: 'Delete…',
- icon: '🗑',
- danger: true,
- disabled: function (c) {
- if (!canMutate(c)) return true;
- if (!serverMode || !window.zddc.cap) return false;
- if (typeof c.node.verbs !== 'string') return false;
- return !window.zddc.cap.has(c.node, 'd');
- },
- tooltip: function (c) {
- if (!serverMode || !canMutate(c)) return '';
- if (!window.zddc.cap) return '';
- if (typeof c.node.verbs !== 'string') return '';
- if (window.zddc.cap.has(c.node, 'd')) return '';
- return "You don't have delete access to this item.";
- },
- action: function (c) { deleteNode(c.node); }
- },
- { separator: true },
-
- // ── Clipboard / identifiers ──
- {
- label: 'Copy path',
- action: function (c) {
- var path = tree.pathFor(c.node);
- if (navigator.clipboard && navigator.clipboard.writeText) {
- navigator.clipboard.writeText(path).then(
- function () { statusInfo('Copied: ' + path); },
- function () { statusError('Clipboard copy denied'); }
- );
- } else {
- statusInfo(path);
- }
- }
- },
- {
- label: 'Copy name',
- action: function (c) {
- // Always include the file extension. node.name
- // already does for normal listings, but re-joining
- // via zddc.joinExtension is defensive against any
- // upstream that ever returns the basename split.
- var n = c.node.name;
- var ext = c.node.ext;
- if (!c.node.isDir && ext
- && !n.toLowerCase().endsWith('.' + ext.toLowerCase())) {
- n = window.zddc.joinExtension(n, ext);
- }
- if (navigator.clipboard && navigator.clipboard.writeText) {
- navigator.clipboard.writeText(n);
- }
- statusInfo('Copied: ' + n);
- }
- },
- { separator: true },
-
- // ── Tree-view ops (folder/zip rows only) ──
- {
- label: 'Expand subtree',
- accel: 'Shift+Click',
- disabled: function (c) { return !(c.node.isDir || c.node.isZip); },
- action: function (c) { tree.expandSubtree(c.node.id); }
- },
- {
- label: 'Collapse subtree',
- disabled: function (c) { return !(c.node.isDir || c.node.isZip); },
- action: function (c) { tree.collapseSubtree(c.node.id); }
- },
- {
- label: 'Navigate into',
- accel: 'Dbl-click',
- disabled: function (c) { return !c.node.isDir; },
- action: function (c) { navigateIntoFolder(c.node); }
- },
- { separator: true },
-
- // ── Plan Review (received// only, cascade-gated) ──
- {
- label: 'Plan Review…',
- visible: function (c) {
- if (!serverMode) return false;
- if (!state.scopeOnPlanReview) return false;
- var pr = window.app.modules.planReview;
- if (!pr) return false;
- return pr.isReceivedTrackingFolder(c.node);
- },
- action: function (c) {
- var pr = window.app.modules.planReview;
- if (pr) pr.invoke(c.node);
- }
- },
- // ── Accept Transmittal (transmittal folder under incoming/) ──
- {
- label: 'Accept Transmittal…',
- visible: function (c) {
- if (!serverMode) return false;
- var at = window.app.modules.acceptTransmittal;
- if (!at) return false;
- return at.isAcceptableTransmittalFolder(c.node);
- },
- action: function (c) {
- var at = window.app.modules.acceptTransmittal;
- if (at) at.invoke(c.node);
- }
- },
- // ── Stage / Unstage (files under working/ or staging/) ──
- {
- label: 'Stage to…',
- visible: function (c) {
- if (!serverMode) return false;
- var s = window.app.modules.stage;
- return !!(s && s.isStageableFile(c.node));
- },
- action: function (c) {
- var s = window.app.modules.stage;
- if (s) s.invokeStage(c.node);
- }
- },
- {
- label: 'Unstage to working/',
- visible: function (c) {
- if (!serverMode) return false;
- var s = window.app.modules.stage;
- return !!(s && s.isUnstageableFile(c.node));
- },
- action: function (c) {
- var s = window.app.modules.stage;
- if (s) s.invokeUnstage(c.node);
- }
- },
- // ── Version history (history:true subtree, real files only) ──
- // Server-mode only: the audit trail (who saved when) is
- // server-stamped, so there's no offline equivalent. node.history
- // is set by the listing when this file sits in a history-enabled
- // cascade subtree (working/).
- {
- label: 'History…',
- icon: '🕘',
- visible: function (c) {
- if (!serverMode) return false;
- if (c.node.isDir || c.node.isZip || c.node.virtual) return false;
- return !!c.node.history;
- },
- action: function (c) {
- var h = window.app.modules.history;
- if (h) h.open(c.node);
- }
- },
- { separator: true },
-
- // ── View ──
- { label: 'Sort by', items: SORT_BY_ITEMS },
- { label: 'Show hidden files',
- checked: function () { return !!state.showHidden; },
- action: function () {
- state.showHidden = !state.showHidden;
- syncURLToSelection();
- refreshListing();
- } }
- ];
+ function openRowMenuFor(row, x, y) {
+ var id = parseInt(row.dataset.id, 10);
+ var node = state.nodes.get(id);
+ if (!node) return;
+ // Select the row first so the highlight + menu target agree.
+ state.selectedId = id;
+ tree.render();
+ syncURLToSelection();
+ var mm = menuModel();
+ if (!mm) return;
+ window.zddc.menu.open({
+ x: x, y: y,
+ context: { node: node, row: row, surface: 'row' },
+ items: function () { return mm.buildRowItems(node, row, prefetchedAccess()); }
+ });
}
- // Right-click on empty space in the tree pane → directory-scope
- // menu. Operations apply to the current scope (state.currentPath),
- // not any specific row.
- function buildPaneMenu() {
- var serverMode = state.source === 'server';
- return [
- {
- label: 'New folder',
- disabled: !canCreateHere(),
- action: function () { createInDir(state.currentPath || '/', 'folder'); }
- },
- {
- label: 'New markdown file',
- disabled: !canCreateHere(),
- action: function () { createInDir(state.currentPath || '/', 'markdown'); }
- },
- // ── Create Transmittal folder (staging/ scope only) ──
- {
- label: 'Create Transmittal folder…',
- visible: function () {
- return serverMode && state.scopeCanonicalFolder === 'staging';
- },
- action: function () {
- var ct = window.app.modules.createTransmittal;
- if (ct) ct.invoke();
- }
- },
- { separator: true },
- {
- label: 'Refresh',
- accel: 'F5',
- action: function () { refreshListing(); }
- },
- { separator: true },
- { label: 'Sort by', items: SORT_BY_ITEMS },
- { label: 'Show hidden files',
- checked: function () { return !!state.showHidden; },
- action: function () {
- state.showHidden = !state.showHidden;
- syncURLToSelection();
- refreshListing();
- } }
- ];
+ function openPaneMenu(x, y) {
+ var mm = menuModel();
+ if (!mm) return;
+ window.zddc.menu.open({
+ x: x, y: y,
+ context: { dir: state.currentPath || '/', surface: 'pane' },
+ items: function () { return mm.buildPaneItems(prefetchedAccess()); }
+ });
}
+ // Prefetch (memoised) the scope access view so the menu's create-gate and
+ // admin/sub-admin tier items resolve without a fetch. Server-mode only;
+ // cap.at returns null on file:// so FS mode leaves scopeAccess null.
+ function prefetchScopeAccess() {
+ if (state.source !== 'server' || !window.zddc || !window.zddc.cap || !window.zddc.cap.at) {
+ state.scopeAccess = null;
+ return;
+ }
+ var path = state.currentPath || '/';
+ window.zddc.cap.at(path).then(function (view) {
+ // Ignore a stale resolution if the scope moved on.
+ if ((state.currentPath || '/') === path) {
+ state.scopeAccess = view || null;
+ applySourceUI();
+ }
+ }, function () { /* best-effort; leave prior value */ });
+ }
+
+
// View mode is URL-driven, not UI-driven.
//
// ?view=grid → grid mode (only honored where classifier is
@@ -13867,8 +14866,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
}
if (state.source === 'fs') {
if (!node.handle || node.handle.kind !== 'directory') return;
- state.rootHandle = node.handle;
- state.currentPath = node.handle.name + '/';
+ var seq = beginNav();
var raw;
try {
raw = await loader.fetchFsChildren(node.handle);
@@ -13876,6 +14874,12 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
statusError('Failed to enter ' + node.name + ': ' + e.message);
return;
}
+ // Mutate scope state only after the fetch succeeds and only if
+ // we're still the latest navigation — a bail here leaves the
+ // previous scope intact rather than half-swapped.
+ if (!isCurrentNav(seq)) return;
+ state.rootHandle = node.handle;
+ state.currentPath = node.handle.name + '/';
tree.setRoot(raw);
tree.render();
statusInfo('Entered ' + node.name);
@@ -13886,6 +14890,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
// history.pushState, fetches the new directory listing, and
// re-renders the tree from scratch. Page DOES NOT reload.
async function rescopeServer(url, displayName) {
+ var seq = beginNav();
var entries;
try {
entries = await loader.fetchServerChildren(url);
@@ -13893,7 +14898,12 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
statusError('Failed to enter ' + displayName + ': ' + (e.message || e));
return;
}
+ // A newer navigation (another dblclick, a refresh, back/forward)
+ // started while this listing was in flight — drop this result so we
+ // don't pushState/setRoot on top of it.
+ if (!isCurrentNav(seq)) return;
state.currentPath = url;
+ prefetchScopeAccess();
// Selection / preview belong to the old scope; clear them so
// the new root doesn't carry stale highlight state.
state.selectedId = null;
@@ -13904,9 +14914,14 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
tree.setRoot(entries);
tree.render();
// Reset the preview pane so the user sees an "empty selection"
- // state at the new scope instead of the previous file.
- var previewBody = document.getElementById('previewBody');
- if (previewBody) previewBody.innerHTML = '';
+ // state at the new scope instead of the previous file. Route
+ // through clearPreview so a live editor is disposed (not leaked).
+ var pmod = previewMod();
+ if (pmod && pmod.clearPreview) pmod.clearPreview();
+ else {
+ var previewBody = document.getElementById('previewBody');
+ if (previewBody) previewBody.innerHTML = '';
+ }
var previewTitle = document.getElementById('previewTitle');
if (previewTitle) previewTitle.textContent = 'No file selected';
var previewMeta = document.getElementById('previewMeta');
@@ -13935,7 +14950,22 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
statusInfo: statusInfo,
statusClear: statusClear,
showBrowseRoot: showBrowseRoot,
- applyResolvedViewMode: applyResolvedViewMode
+ applyResolvedViewMode: applyResolvedViewMode,
+ // Re-fetch + re-render the current listing (restoring expansion +
+ // selection). Workflow modules call this after a move/accept so the
+ // tree reflects the change without a manual reload. upload.js already
+ // depends on it being present.
+ refreshListing: refreshListing,
+ // Shared navigation-sequence token so the popstate handler (app.js)
+ // can't race the in-tool navigations. beginNav() claims the latest
+ // token; isCurrentNav(seq) reports whether it's still latest.
+ beginNav: beginNav,
+ isCurrentNav: isCurrentNav,
+ // Prefetch the current scope's /.profile/access view into
+ // state.scopeAccess (memoised) so the menu's create-gate + admin-tier
+ // items resolve without a fetch. Called by app.js on initial load +
+ // back/forward.
+ prefetchScopeAccess: prefetchScopeAccess
};
})();
@@ -13949,17 +14979,6 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var tree = window.app.modules.tree;
var events = window.app.modules.events;
- // Virtual canonical folder injection used to live here (browse
- // appended archive/working/staging/reviewing entries at a project
- // root when missing). zddc-server now emits them in the listing
- // directly so the .zddc `display:` map can override their labels
- // the same as real entries. This pass-through stub keeps the
- // events.js rescope contract intact without doing any merging.
- function passThroughEntries(entries) { return entries; }
-
- // Expose for events.js's client-side rescope on dblclick.
- window.app.modules.augmentRoot = passThroughEntries;
-
// Walk a `?file=` path segment-by-segment from the current root.
// Each non-leaf segment is matched against the parent's children
// by name; if found and it's a folder, expand+load it (so its
@@ -14043,6 +15062,7 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
tree.setRoot(detected.entries);
events.showBrowseRoot();
tree.render();
+ if (events.prefetchScopeAccess) events.prefetchScopeAccess();
events.statusInfo('Loaded ' + detected.entries.length + ' item'
+ (detected.entries.length === 1 ? '' : 's')
+ ' from ' + detected.path);
@@ -14073,15 +15093,27 @@ var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
var popQS = new URLSearchParams(location.search);
if (popQS.get('hidden') === '1') window.app.state.showHidden = true;
else window.app.state.showHidden = false;
+ // Join the shared nav token: rapid back/forward (or back/forward
+ // while an in-tool rescope is mid-flight) must not apply a stale
+ // listing on top of a newer one.
+ var seq = events.beginNav ? events.beginNav() : 0;
try {
var es = await loader.fetchServerChildren(path);
+ if (events.isCurrentNav && !events.isCurrentNav(seq)) return;
window.app.state.currentPath = path;
window.app.state.selectedId = null;
window.app.state.lastPreviewedNodeId = null;
tree.setRoot(es);
tree.render();
- var previewBody = document.getElementById('previewBody');
- if (previewBody) previewBody.innerHTML = '';
+ if (events.prefetchScopeAccess) events.prefetchScopeAccess();
+ // Route through clearPreview so a live editor is disposed
+ // (not leaked) when back/forward swaps scope.
+ var pmod = window.app.modules.preview;
+ if (pmod && pmod.clearPreview) pmod.clearPreview();
+ else {
+ var previewBody = document.getElementById('previewBody');
+ if (previewBody) previewBody.innerHTML = '';
+ }
var previewTitle = document.getElementById('previewTitle');
if (previewTitle) previewTitle.textContent = 'No file selected';
// Reapply view mode for the new URL (incoming/ → grid, etc).
diff --git a/zddc/internal/apps/embedded/classifier.html b/zddc/internal/apps/embedded/classifier.html
index ad4e9c7..0202715 100644
--- a/zddc/internal/apps/embedded/classifier.html
+++ b/zddc/internal/apps/embedded/classifier.html
@@ -1793,7 +1793,7 @@ body.is-elevated::after {
ZDDC Classifier
-
+
diff --git a/zddc/internal/apps/embedded/index.html b/zddc/internal/apps/embedded/index.html
index b015025..526440d 100644
--- a/zddc/internal/apps/embedded/index.html
+++ b/zddc/internal/apps/embedded/index.html
@@ -1536,7 +1536,7 @@ body {
ZDDC
-
+
diff --git a/zddc/internal/apps/embedded/transmittal.html b/zddc/internal/apps/embedded/transmittal.html
index 5f764cc..bcde642 100644
--- a/zddc/internal/apps/embedded/transmittal.html
+++ b/zddc/internal/apps/embedded/transmittal.html
@@ -2635,7 +2635,7 @@ dialog.modal--narrow {
ZDDC Transmittal
-
+
JavaScript not available