Skip to content

Commit

Permalink
Merge pull request #39540 from nextcloud/feat/migrate-nc-vue-8
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Aug 2, 2023
2 parents 114cad3 + 6503125 commit 8fa9607
Show file tree
Hide file tree
Showing 220 changed files with 2,699 additions and 24,226 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/**
* @copyright 2019 Christoph Wurst <[email protected]>
* @copyright Copyright (c) 2023 John Molakvoæ <[email protected]>
*
* @author Christoph Wurst <[email protected]>
* @author John Molakvoæ <[email protected]>
* @author Roeland Jago Douma <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand All @@ -21,3 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

export const loadState = function(app: string, key: string, fallback?: any) {
return fallback
}
3 changes: 2 additions & 1 deletion apps/comments/src/components/Comment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@

<!-- Message content -->
<!-- The html is escaped and sanitized before rendering -->
<!-- eslint-disable-next-line vue/no-v-html-->
<!-- eslint-disable vue/no-v-html-->
<div v-else
:class="{'comment__message--expanded': expanded}"
class="comment__message"
@click="onExpand"
v-html="renderedContent" />
<!-- eslint-enable vue/no-v-html-->
</div>
</component>
</template>
Expand Down
14 changes: 7 additions & 7 deletions apps/comments/src/views/Comments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
-->

<template>
<div class="comments"
:class="{ 'icon-loading': isFirstLoading }"
v-observe-visibility="onVisibilityChange">
<div v-observe-visibility="onVisibilityChange"
class="comments"
:class="{ 'icon-loading': isFirstLoading }">
<!-- Editor -->
<Comment v-bind="editorData"
:auto-complete="autoComplete"
Expand All @@ -37,7 +37,7 @@
<template v-if="!isFirstLoading">
<NcEmptyContent v-if="!hasComments && done"
class="comments__empty"
:title="t('comments', 'No comments yet, start the conversation!')">
:name="t('comments', 'No comments yet, start the conversation!')">
<template #icon>
<MessageReplyTextIcon />
</template>
Expand Down Expand Up @@ -65,7 +65,7 @@

<!-- Error message -->
<template v-else-if="error">
<NcEmptyContent class="comments__error" :title="error">
<NcEmptyContent class="comments__error" :name="error">
<template #icon>
<AlertCircleOutlineIcon />
</template>
Expand Down Expand Up @@ -191,8 +191,8 @@ export default {
/**
* Make sure we have all mentions as Array of objects
*
* @param {Array} mentions the mentions list
* @return {Object<string, object>}
* @param {any[]} mentions the mentions list
* @return {Record<string, object>}
*/
genMentionsData(mentions) {
Object.values(mentions)
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/views/Availability.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NcSettingsSection :title="$t('dav', 'Availability')"
<NcSettingsSection :name="$t('dav', 'Availability')"
:description="$t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.')">
<div class="time-zone">
<strong>
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/views/CalDavSettings.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NcSettingsSection :title="$t('dav', 'Calendar server')"
<NcSettingsSection :name="$t('dav', 'Calendar server')"
:doc-url="userSyncCalendarsDocUrl">
<!-- Can use v-html as:
- $t passes the translated string through DOMPurify.sanitize,
Expand Down
Loading

0 comments on commit 8fa9607

Please sign in to comment.