Skip to content

Commit 5024328

Browse files
Merge pull request #743 from nextcloud/bugfix/727/keep-plaintext-fallback
Keep plaintext fallback when no RichText is given
2 parents 38d58fb + 6b98e0a commit 5024328

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

css/styles.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
align-self: flex-start;
122122
}
123123

124+
& > span.subject,
125+
& > a > span.subject,
124126
& > .rich-text--wrapper,
125127
& > a > .rich-text--wrapper {
126128
padding-left: 10px;

js/notifications.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/notifications.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Components/Notification.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,27 @@
1212
<a v-if="useLink" :href="link" class="notification-subject full-subject-link">
1313
<span v-if="icon" class="image"><img :src="icon" class="notification-icon"></span>
1414
<RichText
15+
v-if="subjectRich"
1516
:text="subjectRich"
1617
:arguments="preparedSubjectParameters" />
18+
<span v-else class="subject">{{ subject }}</span>
1719
</a>
1820
<div v-else class="notification-subject">
1921
<span v-if="icon" class="image"><img :src="icon" class="notification-icon"></span>
2022
<RichText
23+
v-if="subjectRich"
2124
:text="subjectRich"
2225
:arguments="preparedSubjectParameters" />
26+
<span v-else class="subject">{{ subject }}</span>
2327
</div>
2428
<div v-if="message" class="notification-message" @click="onClickMessage">
2529
<div class="message-container" :class="{ collapsed: isCollapsedMessage }">
2630
<RichText
31+
v-if="messageRich"
2732
:text="messageRich"
2833
:arguments="preparedMessageParameters"
2934
:autolink="true" />
35+
<span v-else>{{ message }}</span>
3036
</div>
3137
<div v-if="isCollapsedMessage" class="notification-overflow" />
3238
</div>

0 commit comments

Comments
 (0)