diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-01-09 14:54:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 14:54:54 +0300 |
| commit | f6989b69a6063a576c422399cb68599888c96013 (patch) | |
| tree | 2bade3a82bcb9a7132eed9a8c1e1b24c7b9decb0 /src | |
| parent | c1edaeecec74469870ddec62cfc4c0b697ee2412 (diff) | |
| parent | d7fd9268a6266741706cdba25bda1cdecc8efbc6 (diff) | |
Merge pull request #2701 from nextcloud/bugfix/noid/fix-posting-messages
Prevent empty messages and pasting HTML
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue | 11 | ||||
| -rw-r--r-- | src/components/NewMessageForm/NewMessageForm.vue | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue index 80ee19484..65e9d42e6 100644 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue @@ -24,7 +24,8 @@ v-contenteditable:text="active" :placeHolder="placeholderText" class="new-message-form__advancedinput" - @keydown.enter="handleKeydown" /> + @keydown.enter="handleKeydown" + @paste="onPaste" /> </template> <script> @@ -81,6 +82,12 @@ export default { EventBus.$off('routeChange', this.focusInput) }, methods: { + onPaste(e) { + e.preventDefault() + const text = e.clipboardData.getData('text/plain') + document.execCommand('insertText', false, text) + }, + /** * Focuses the contenteditable div input */ @@ -113,7 +120,7 @@ export default { <style lang="scss" scoped> .new-message-form__advancedinput { - overflow: show; + overflow: visible; width: 100%; border:none; margin: 0; diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index ba77c469c..73d6ec537 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -161,7 +161,7 @@ export default { * Sends the new message */ async handleSubmit() { - if (this.text !== '') { + if (this.text.trim() !== '') { const temporaryMessage = this.createTemporaryMessage() this.$store.dispatch('addTemporaryMessage', temporaryMessage) this.text = '' |