Skip to content

Commit

Permalink
Merge pull request #6600 from nextcloud/backport/6597/stable30
Browse files Browse the repository at this point in the history
[stable30] Fix some JS console errors
  • Loading branch information
juliusknorr authored Nov 7, 2024
2 parents 9286574 + 63089b3 commit afc35d1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/components/Assistant.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
class="floating-menu--badge" />
</FloatingMenu>

<NcModal :show.sync="showTaskList">
<NcModal :show.sync="showTaskList" :name="t('text', 'Assistant results')">
<div class="task-list">
<h4 v-if="tasks.length > 0">
<span class="assistant-bubble">
Expand Down
4 changes: 3 additions & 1 deletion src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ export default {

return val
},
inject: ['isEmbedded'],
inject: {
isEmbedded: { default: false },
},
props: {
richWorkspace: {
type: Boolean,
Expand Down
11 changes: 8 additions & 3 deletions src/components/Modal/Translate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
-->

<template>
<NcModal :show="show" size="large" @close="$emit('close')">
<NcModal :show="show"
size="large"
:name="t('text', 'Translate')"
@close="$emit('close')">
<div class="translate-dialog">
<h2>{{ t('text', 'Translate') }}</h2>
<em>{{ t('text', 'To translate individual parts of the text, select it before using the translate function.') }}</em>
Expand All @@ -15,6 +18,7 @@
<NcSelect v-model="fromLanguage"
input-id="fromLanguage"
:placeholder="t('text', 'Select language')"
:aria-label-combobox="t('text', 'Translate from')"
:options="fromLanguages"
:disabled="disableFromLanguageSelect"
:append-to-body="false" />
Expand All @@ -34,6 +38,7 @@
<NcSelect v-model="toLanguage"
input-id="toLanguage"
:placeholder="t('text', 'Select language')"
:aria-label-combobox="t('text', 'Translate to')"
:options="toLanguages"
:disabled="!fromLanguage"
:append-to-body="false" />
Expand Down Expand Up @@ -158,12 +163,12 @@ export default {
this.input = this.content
},
input() {
this.result = null
this.result = ''
this.error = null
this.autosize()
},
toLanguage() {
this.result = null
this.result = ''
this.error = null
},
},
Expand Down

0 comments on commit afc35d1

Please sign in to comment.