From 2a4ca010dd2f93edc9b847fe7f8be9779c9d9327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 16 May 2022 19:52:22 +0200 Subject: [PATCH 1/3] Release message right-click context menu out of labs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/views/rooms/EventTile.tsx | 3 --- src/settings/Settings.tsx | 7 ------- 2 files changed, 10 deletions(-) diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 9ccf7d44dd5..ee8570e89af 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -848,9 +848,6 @@ export class UnwrappedEventTile extends React.Component { private showContextMenu(ev: React.MouseEvent, permalink?: string): void { const clickTarget = ev.target as HTMLElement; - // Return if message right-click context menu isn't enabled - if (!SettingsStore.getValue("feature_message_right_click_context_menu")) return; - // Try to find an anchor element const anchorElement = (clickTarget instanceof HTMLAnchorElement) ? clickTarget : clickTarget.closest("a"); diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index 4adbda2acb9..9a8717aea2d 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -394,13 +394,6 @@ export const SETTINGS: {[setting: string]: ISetting} = { displayName: _td("Don't send read receipts"), default: false, }, - "feature_message_right_click_context_menu": { - isFeature: true, - supportedLevels: LEVELS_FEATURE, - labsGroup: LabGroup.Rooms, - displayName: _td("Right-click message context menu"), - default: false, - }, "feature_location_share_pin_drop": { isFeature: true, labsGroup: LabGroup.Messaging, From 0c674508237d81f8fe68ac8f6873a2080144e531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 16 May 2022 19:55:49 +0200 Subject: [PATCH 2/3] i18n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index ede1176ef68..75bf1933b1b 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -902,7 +902,6 @@ "Right panel stays open (defaults to room member list)": "Right panel stays open (defaults to room member list)", "Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)", "Don't send read receipts": "Don't send read receipts", - "Right-click message context menu": "Right-click message context menu", "Location sharing - pin drop": "Location sharing - pin drop", "Live Location Sharing (temporary implementation: locations persist in room history)": "Live Location Sharing (temporary implementation: locations persist in room history)", "Font size": "Font size", From ad0b9b39e7c83710756e3a7cff535b97f554f6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 16 Aug 2022 17:20:38 +0200 Subject: [PATCH 3/3] Fix feature name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/settings/Settings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index bfdd3ef7f19..c5f1511420c 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -406,7 +406,7 @@ export const SETTINGS: {[setting: string]: ISetting} = { displayName: _td("Send read receipts"), default: true, }, - "feature_location_share_pin_drop": { + "feature_location_share_live": { isFeature: true, labsGroup: LabGroup.Messaging, supportedLevels: LEVELS_FEATURE,