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.

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

[stable4.7] fix(attachments): improve layout #6277

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions src/components/Editor/Attachments/AttachmentsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@

<NcDialog :open.sync="showOpenConfirmation"
:name="t('calendar', 'Confirmation')"
:message="openConfirmationMessage"
:buttons="openConfirmationButtons" />
:buttons="openConfirmationButtons">
<p class="external-link-message">
{{ openConfirmationMessage }}
</p>
</NcDialog>

Check warning on line 67 in src/components/Editor/Attachments/AttachmentsList.vue

View check run for this annotation

Codecov / codecov/patch

src/components/Editor/Attachments/AttachmentsList.vue#L64-L67

Added lines #L64 - L67 were not covered by tests
</div>
</template>

Expand Down Expand Up @@ -221,7 +224,8 @@
}

// Otherwise, show a confirmation dialog
this.openConfirmationMessage = t('calendar', 'You are about to navigate to an untrusted external link. Are you sure to proceed? Link: {link}', {
this.openConfirmationMessage = t('calendar', 'You are about to navigate to {host}. Are you sure to proceed? Link: {link}', {
host: url.host,
link: url.href,
})
this.openConfirmationButtons = [
Expand All @@ -236,7 +240,7 @@
type: 'primary',
callback: () => {
window.open(url.href, '_blank', 'noopener noreferrer')
}

Check warning on line 243 in src/components/Editor/Attachments/AttachmentsList.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Missing trailing comma
},
]
this.showOpenConfirmation = true
Expand Down Expand Up @@ -314,4 +318,8 @@
height: 24px;
border-radius: var(--border-radius);
}

.external-link-message {
overflow-wrap: break-word;
}
</style>
Loading