AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Merge branch 'from/develop/tusooa/fix-lint-2' into 'develop'

Browse source 
Lint

See merge request pleroma/pleroma-fe!1442
This commit is contained in:
HJ 2022-03-06 19:35:05 +00:00
commit 7e1e8ea429
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/components/attachment/attachment.vue
View file

@ -82,56 +82,56 @@
<button <button
v-if="type === 'flash' && flashLoaded" v-if="type === 'flash' && flashLoaded"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="stopFlash"
:title="$t('status.attachment_stop_flash')" :title="$t('status.attachment_stop_flash')"
@click.prevent="stopFlash"
> >
<FAIcon icon="stop" /> <FAIcon icon="stop" />
</button> </button>
<button <button
v-if="attachment.description && size !== 'small' && !edit && type !== 'unknown'" v-if="attachment.description && size !== 'small' && !edit && type !== 'unknown'"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="toggleDescription"
:title="$t('status.show_attachment_description')" :title="$t('status.show_attachment_description')"
@click.prevent="toggleDescription"
> >
<FAIcon icon="align-right" /> <FAIcon icon="align-right" />
</button> </button>
<button <button
v-if="!useModal && type !== 'unknown'" v-if="!useModal && type !== 'unknown'"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="openModalForce"
:title="$t('status.show_attachment_in_modal')" :title="$t('status.show_attachment_in_modal')"
@click.prevent="openModalForce"
> >
<FAIcon icon="search-plus" /> <FAIcon icon="search-plus" />
</button> </button>
<button <button
v-if="nsfw && hideNsfwLocal" v-if="nsfw && hideNsfwLocal"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="toggleHidden"
:title="$t('status.hide_attachment')" :title="$t('status.hide_attachment')"
@click.prevent="toggleHidden"
> >
<FAIcon icon="times" /> <FAIcon icon="times" />
</button> </button>
<button <button
v-if="shiftUp" v-if="shiftUp"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="onShiftUp"
:title="$t('status.move_up')" :title="$t('status.move_up')"
@click.prevent="onShiftUp"
> >
<FAIcon icon="chevron-left" /> <FAIcon icon="chevron-left" />
</button> </button>
<button <button
v-if="shiftDn" v-if="shiftDn"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="onShiftDn"
:title="$t('status.move_down')" :title="$t('status.move_down')"
@click.prevent="onShiftDn"
> >
<FAIcon icon="chevron-right" /> <FAIcon icon="chevron-right" />
</button> </button>
<button <button
v-if="remove" v-if="remove"
class="button-unstyled attachment-button" class="button-unstyled attachment-button"
@click.prevent="onRemove"
:title="$t('status.remove_attachment')" :title="$t('status.remove_attachment')"
@click.prevent="onRemove"
> >
<FAIcon icon="trash-alt" /> <FAIcon icon="trash-alt" />
</button> </button>
@ -161,7 +161,10 @@
:href="attachment.url" :href="attachment.url"
target="_blank" target="_blank"
> >
<FAIcon size="5x" :icon="placeholderIconClass" /> <FAIcon
size="5x"
:icon="placeholderIconClass"
/>
<p> <p>
{{ localDescription }} {{ localDescription }}
</p> </p>

4
src/components/gallery/gallery.vue
View file

@ -26,8 +26,8 @@
:size="size" :size="size"
:editable="editable" :editable="editable"
:remove="removeAttachment" :remove="removeAttachment"
:shiftUp="!(attachmentIndex === 0 && rowIndex === 0) && shiftUpAttachment" :shift-up="!(attachmentIndex === 0 && rowIndex === 0) && shiftUpAttachment"
:shiftDn="!(attachmentIndex === row.items.length - 1 && rowIndex === rows.length - 1) && shiftDnAttachment" :shift-dn="!(attachmentIndex === row.items.length - 1 && rowIndex === rows.length - 1) && shiftDnAttachment"
:edit="editAttachment" :edit="editAttachment"
:description="descriptions && descriptions[attachment.id]" :description="descriptions && descriptions[attachment.id]"
:hide-description="size === 'small' || tooManyAttachments && hidingLong" :hide-description="size === 'small' || tooManyAttachments && hidingLong"