#2089 - Remove 'Edit poll' menu (#2090)

* remove edit poll menu * remove unused constants * fix the linter err * restore delete option
okTurtles · Jun 21, 2024 · abedfe6 · abedfe6
1 parent 29e39ab
commit abedfe6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/frontend/views/containers/chatroom/MessageActions.vue b/frontend/views/containers/chatroom/MessageActions.vue
@@ -164,10 +164,11 @@ export default ({
       return this.isText || this.isPoll
     },
     isEditable () {
-      return this.isMsgSender && (this.isText || this.isPoll)
+      return this.isMsgSender && this.isText
     },
     isDeletable () {
-      return this.isEditable || this.isGroupCreator
+      return this.isGroupCreator ||
+        (this.isMsgSender && (this.isText || this.isPoll))
     }
   },
   methods: {

diff --git a/frontend/views/containers/chatroom/MessageBase.vue b/frontend/views/containers/chatroom/MessageBase.vue
@@ -116,10 +116,7 @@ import SendArea from './SendArea.vue'
 import ChatAttachmentPreview from './file-attachment/ChatAttachmentPreview.vue'
 import { humanDate } from '@model/contracts/shared/time.js'
 import { swapMentionIDForDisplayname } from '@model/contracts/shared/functions.js'
-import {
-  MESSAGE_TYPES,
-  MESSAGE_VARIANTS
-} from '@model/contracts/shared/constants.js'
+import { MESSAGE_VARIANTS } from '@model/contracts/shared/constants.js'
 import { OPEN_TOUCH_LINK_HELPER } from '@utils/events.js'
 import { L, LTags } from '@common/common.js'
 
@@ -201,11 +198,7 @@ export default ({
     humanDate,
     swapMentionIDForDisplayname,
     editMessage () {
-      if (this.type === MESSAGE_TYPES.POLL) {
-        alert('TODO: implement editting a poll')
-      } else {
-        this.isEditing = true
-      }
+      this.isEditing = true
     },
     onMessageEdited (newMessage) {
       this.isEditing = false