Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(message): disable save on empty message #3317

Merged
merged 4 commits into from
May 31, 2022
Merged

fix(message): disable save on empty message #3317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e29076f
fix(message): disable save on empty message
jasonwoodland May 27, 2022
4e03a87
fix(message): edit message style/layout
jasonwoodland May 27, 2022
dbfef1b
style(message): add types/remove $data and $props
jasonwoodland May 30, 2022
5a72d3e
fix(message): add error toast
jasonwoodland May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions components/views/chat/message/edit/Edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
</div>
<div class="edit-message-bottom">
<div>
{{$t('messaging.edit.escape_to')}}
<a @click="cancelMessage">{{$t('messaging.edit.cancel')}}</a>
{{$t('messaging.edit.enter_to')}}
<a @click="saveMessage">{{$t('messaging.edit.save')}}</a>
<div>
{{$t('messaging.edit.escape_to')}}
<a @click="cancelMessage">{{$t('messaging.edit.cancel')}}</a>
</div>
<div>
{{$t('messaging.edit.enter_to')}}
<a @click="saveMessage">{{$t('messaging.edit.save')}}</a>
</div>
</div>
<div>{{lengthCount}}/{{maxChars}}</div>
</div>
Expand Down
10 changes: 7 additions & 3 deletions components/views/chat/message/edit/Edit.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@
margin: 0 -@light-spacing 0 0;
justify-content: space-between;
& > div {
padding: 0 @light-spacing;
a {
margin-right: @light-spacing;
display: flex;
margin: 0 @light-spacing;
> div {
&:not(:last-child)::after {
content: '•';
margin: 0 @light-spacing;
}
}
}
}
Expand Down
24 changes: 10 additions & 14 deletions components/views/chat/message/edit/Edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ import { Config } from '~/config'
import { KeybindingEnum } from '~/libraries/Enums/enums'
import Editable from '~/components/views/chat/chatbar/Editable.vue'

declare module 'vue/types/vue' {
interface Vue {
saveMessage: Function
cancelMessage: Function
lengthCount: number
charlimit: boolean
}
}

export default Vue.extend({
components: {
SmileIcon,
Expand All @@ -40,19 +31,23 @@ export default Vue.extend({
}
},
computed: {
lengthCount() {
return this.$data.content.length
lengthCount(): number {
return this.content.length
},
charlimit() {
charlimit(): boolean {
return this.lengthCount > this.maxChars
},
},
mounted() {
this.$data.content = this.$props.message
this.content = this.message
},
methods: {
saveMessage() {
this.$emit('commitMessage', this.$data.content.slice(0, this.maxChars))
if (this.content.trim().length === 0) {
this.$toast.error(this.$t('errors.chat.empty_message_error') as string)
return
}
this.$emit('commitMessage', this.content.slice(0, this.maxChars))
},
cancelMessage() {
this.$emit('cancelMessage')
Expand All @@ -64,6 +59,7 @@ export default Vue.extend({
switch (event.key) {
case KeybindingEnum.ENTER:
if (!event.shiftKey) {
event.preventDefault()
this.saveMessage()
}
break
Expand Down
4 changes: 2 additions & 2 deletions locales/en-US.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ export default {
files: 'Files',
},
edit: {
escape_to: 'escape to ',
escape_to: 'escape to',
cancel: 'cancel',
enter_to: ' • enter to ',
enter_to: 'enter to',
save: 'save',
},
},
Expand Down