fix merge failure
This commit is contained in:
parent
e06f37a7d4
commit
faefc9b181
|
@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div class="name">{{ file.name }}</div>
|
<div class="name">{{ file.name }}</div>
|
||||||
<button v-tooltip="i18n.ts.remove" class="remove _button" @click="remove(file)"><i class="ti ti-x"></i></button>
|
<button v-tooltip="i18n.ts.remove" class="remove _button" @click="remove(file)"><i class="ti ti-x"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<MkButton primary @click="selectFile"><i class="ti ti-plus"></i> {{ i18n.ts.attachFile }}</MkButton>
|
<MkButton primary @click="chooseFile"><i class="ti ti-plus"></i> {{ i18n.ts.attachFile }}</MkButton>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MkSwitch v-model="isSensitive">{{ i18n.ts.markAsSensitive }}</MkSwitch>
|
<MkSwitch v-model="isSensitive">{{ i18n.ts.markAsSensitive }}</MkSwitch>
|
||||||
|
@ -66,7 +66,7 @@ const isSensitive = ref(false);
|
||||||
function chooseFile(evt) {
|
function chooseFile(evt) {
|
||||||
selectFile({
|
selectFile({
|
||||||
anchorElement: evt.currentTarget ?? evt.target,
|
anchorElement: evt.currentTarget ?? evt.target,
|
||||||
multiple: false,
|
multiple: true,
|
||||||
}).then(selected => {
|
}).then(selected => {
|
||||||
files.value = files.value.concat(selected);
|
files.value = files.value.concat(selected);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue