diff --git a/integ_tests/test_sharing_login.py b/integ_tests/test_sharing_login.py index f6f1f665..727e50e1 100644 --- a/integ_tests/test_sharing_login.py +++ b/integ_tests/test_sharing_login.py @@ -128,7 +128,7 @@ def test_incoming_shares( ).to_be_checked() # 6. Verify "shared by admin" and button visibility in the collection article - page.click('#incomingsharingscene button[data-name="cancel"]') + page.click('#incomingsharingscene button[data-name="close"]') expect(page.locator("#incomingsharingscene")).to_be_hidden() article = page.locator("article:not(.hidden)").first @@ -179,5 +179,5 @@ def test_no_incoming_shares_message( page.locator('#incomingsharingscene [data-name="nosharesmessage"]') ).to_have_text("No incoming shares") - page.click('#incomingsharingscene button[data-name="cancel"]') + page.click('#incomingsharingscene button[data-name="close"]') expect(page.locator("#incomingsharingscene")).to_be_hidden() diff --git a/radicale/web/internal_data/index.html b/radicale/web/internal_data/index.html index 40bf5e96..5eadde28 100644 --- a/radicale/web/internal_data/index.html +++ b/radicale/web/internal_data/index.html @@ -260,7 +260,7 @@
No incoming shares
diff --git a/radicale/web/internal_data/js/scenes/IncomingSharingScene.js b/radicale/web/internal_data/js/scenes/IncomingSharingScene.js index fee432d6..b9df25ad 100644 --- a/radicale/web/internal_data/js/scenes/IncomingSharingScene.js +++ b/radicale/web/internal_data/js/scenes/IncomingSharingScene.js @@ -40,7 +40,7 @@ export class IncomingSharingScene { this._password = password; this._html_scene = get_element_by_id("incomingsharingscene"); - this._cancel_btn = get_element(this._html_scene, "[data-name=cancel]"); + this._close_btn = get_element(this._html_scene, "[data-name=close]"); this._error_element = get_element(this._html_scene, "[data-name=error]"); this._tbody = get_element(this._html_scene, "tbody[data-name=incomingsharesbody]"); this._template = get_element(this._tbody, "[data-name=incomingsharerowtemplate]"); @@ -144,14 +144,14 @@ export class IncomingSharingScene { show() { this._html_scene.classList.remove("hidden"); - this._cancel_btn.onclick = () => pop_scene(); + this._close_btn.onclick = () => pop_scene(); this._error_handler.clearError(); collectionsCache.getIncomingShares(this._user, this._password, this._error_handler.setError, (shares) => this._render_shares(shares)); } hide() { this._html_scene.classList.add("hidden"); - this._cancel_btn.onclick = null; + this._close_btn.onclick = null; this._error_handler.clearError(); }