diff --git a/scripts/livepass.py b/scripts/livepass.py index d6c4764d..427775f2 100755 --- a/scripts/livepass.py +++ b/scripts/livepass.py @@ -194,7 +194,8 @@ UI_TEMPLATE = """ { ws_id: "c3d4e5f6a1b2", title: - "a very long workstream title that should wrap rather than punch out of the dialog box entirely", + "a very long workstream title that should wrap " + + "rather than punch out of the dialog box entirely", }, ]); c.toggleAll(); diff --git a/tests/test_hatch_js.py b/tests/test_hatch_js.py index 4cdcb256..1e509dda 100644 --- a/tests/test_hatch_js.py +++ b/tests/test_hatch_js.py @@ -199,19 +199,17 @@ def test_every_hatch_button_is_wired() -> None: continue bid = re.escape(idm.group(1)) direct = re.search( - r'getElementById\(\s*"%s"\s*\)[\s\S]{0,120}?\.(?:onclick|addEventListener)' - % bid, + rf'getElementById\(\s*"{bid}"\s*\)[\s\S]{{0,120}}?\.(?:onclick|addEventListener)', js, ) wired = bool(direct) if not wired: for vm in re.finditer( - r'(?:const|var|let)\s+(\w+)\s*=\s*document\.getElementById\(\s*"%s"\s*\)' - % bid, + rf'(?:const|var|let)\s+(\w+)\s*=\s*document\.getElementById\(\s*"{bid}"\s*\)', js, ): var = re.escape(vm.group(1)) - if re.search(r"\b%s\s*\.\s*(?:onclick|addEventListener)" % var, js): + if re.search(rf"\b{var}\s*\.\s*(?:onclick|addEventListener)", js): wired = True break assert wired, ( diff --git a/turnstone/shared_static/hatch.js b/turnstone/shared_static/hatch.js index 642047da..55b014e5 100644 --- a/turnstone/shared_static/hatch.js +++ b/turnstone/shared_static/hatch.js @@ -180,6 +180,7 @@ export function closeShelf(dlg) { // hide it when no open shelf shares the host. let hostStillBusy = false; for (const [other] of _shelfState) { + if (!other.isConnected) continue; // detached with its pane — not an owner if (state.scrim.parentElement === _hostOf(other)) hostStillBusy = true; } if (!hostStillBusy) state.scrim.hidden = true; diff --git a/turnstone/shared_static/toast.js b/turnstone/shared_static/toast.js index 105c8ae7..56ed2202 100644 --- a/turnstone/shared_static/toast.js +++ b/turnstone/shared_static/toast.js @@ -46,7 +46,7 @@ function _displayToast(el, message, type) { } catch (e) { /* already hidden */ } - el.popover = null; // restore the classic fade path + el.removeAttribute("popover"); // restore the classic fade path } _toastShowing = false; _toastTimer = null;