Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/dav/src/components/ExampleContactSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ export default {
},
{
label: this.$t('dav', 'Import'),
type: 'primary',
icon: IconCheck,
variant: 'primary',
callback: () => { this.clickImportInput() },
},
],
Expand Down
6 changes: 3 additions & 3 deletions apps/files/src/actions/moveOrCopyAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ async function openFilePickerForAction(

if (action === MoveCopyAction.COPY || action === MoveCopyAction.MOVE_OR_COPY) {
buttons.push({
label: target ? t('files', 'Copy to {target}', { target }, undefined, { escape: false, sanitize: false }) : t('files', 'Copy'),
type: 'primary',
label: target ? t('files', 'Copy to {target}', { target }, { escape: false, sanitize: false }) : t('files', 'Copy'),
variant: 'primary',
icon: CopyIconSvg,
disabled: selection.some((node) => (node.permissions & Permission.CREATE) === 0),
async callback(destination: Node[]) {
Expand Down Expand Up @@ -271,7 +271,7 @@ async function openFilePickerForAction(
if (action === MoveCopyAction.MOVE || action === MoveCopyAction.MOVE_OR_COPY) {
buttons.push({
label: target ? t('files', 'Move to {target}', { target }, undefined, { escape: false, sanitize: false }) : t('files', 'Move'),
type: action === MoveCopyAction.MOVE ? 'primary' : 'secondary',
variant: action === MoveCopyAction.MOVE ? 'primary' : 'secondary',
icon: FolderMoveSvg,
async callback(destination: Node[]) {
resolve({
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/actions/openLocallyAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ async function confirmLocalEditDialog(): Promise<'online' | 'local' | false> {
.setButtons([
{
label: t('files', 'Retry and close'),
type: 'secondary',
variant: 'secondary',
callback: () => {
result = 'local'
},
},
{
label: t('files', 'Open online'),
icon: IconWeb,
type: 'primary',
variant: 'primary',
callback: () => {
result = 'online'
},
Expand Down
8 changes: 4 additions & 4 deletions apps/files/src/views/DialogConfirmFileExtension.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@ const dontShowAgain = computed({
set: (value: boolean) => userConfigStore.update('show_dialog_file_extension', !value),
})

const buttons = computed<IDialogButton[]>(() => [
const buttons = computed(() => [
{
label: props.oldExtension
? t('files', 'Keep {old}', { old: props.oldExtension })
: t('files', 'Keep without extension'),
icon: svgIconCancel,
type: 'secondary',
variant: 'secondary',
callback: () => closeDialog(false),
},
{
label: props.newExtension
? t('files', 'Use {new}', { new: props.newExtension })
: t('files', 'Remove extension'),
icon: svgIconCheck,
type: 'primary',
variant: 'primary',
callback: () => closeDialog(true),
},
])
] satisfies IDialogButton[])

/** Open state of the dialog */
const open = ref(true)
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/views/ReferenceFileWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default defineComponent({
window.open(generateFileUrl(node.fileid!))
}
},
type: 'primary',
variant: 'primary',
})
.disableNavigation()
.startAt(this.richObject.path)
Expand Down
4 changes: 2 additions & 2 deletions apps/files_external/src/views/CredentialsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export default defineComponent({
dialogButtons() {
return [{
label: t('files_external', 'Confirm'),
type: 'primary',
nativeType: 'submit',
type: 'submit',
variant: 'primary',
}]
},
},
Expand Down
8 changes: 4 additions & 4 deletions apps/files_versions/src/components/VersionLabelDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ export default defineComponent({
// If there is already a label set, offer to remove the version label
buttons.push({
label: t('files_versions', 'Remove version name'),
type: 'error',
nativeType: 'reset',
type: 'reset',
variant: 'error',
callback: () => { this.setVersionLabel('') },
})
}
return [
...buttons,
{
label: t('files_versions', 'Save version name'),
type: 'primary',
nativeType: 'submit',
icon: svgCheck,
type: 'submit',
variant: 'primary',
},
]
},
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/src/components/BackgroundSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export default {
callback: (nodes) => {
this.applyFile(nodes[0]?.path)
},
type: 'primary',
variant: 'primary',
})
.build()
picker.pick()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const dialogButtons = [
},
{
label: t('updatenotification', 'Get started'),
type: 'primary',
variant: 'primary',
callback: () => {
emit('dismiss')
emit('update:open', false)
Expand Down
2 changes: 2 additions & 0 deletions dist/1879-1879.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 1 addition & 1 deletion dist/3835-3835.js.map → dist/1879-1879.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/1879-1879.js.map.license
2 changes: 0 additions & 2 deletions dist/3835-3835.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/3835-3835.js.map.license

This file was deleted.

2 changes: 2 additions & 0 deletions dist/4139-4139.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Loading
Loading