logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 7e1e8ea42925dffbce1d75e463f38a2c051c764d
parent 1e41c2b99e7c6200eccb485ad1c7b2508ea5aff9
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Sun,  6 Mar 2022 19:35:05 +0000

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

Lint

See merge request pleroma/pleroma-fe!1442

Diffstat:

Msrc/components/attachment/attachment.vue19+++++++++++--------
Msrc/components/gallery/gallery.vue4++--
2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue @@ -82,56 +82,56 @@ <button v-if="type === 'flash' && flashLoaded" class="button-unstyled attachment-button" - @click.prevent="stopFlash" :title="$t('status.attachment_stop_flash')" + @click.prevent="stopFlash" > <FAIcon icon="stop" /> </button> <button v-if="attachment.description && size !== 'small' && !edit && type !== 'unknown'" class="button-unstyled attachment-button" - @click.prevent="toggleDescription" :title="$t('status.show_attachment_description')" + @click.prevent="toggleDescription" > <FAIcon icon="align-right" /> </button> <button v-if="!useModal && type !== 'unknown'" class="button-unstyled attachment-button" - @click.prevent="openModalForce" :title="$t('status.show_attachment_in_modal')" + @click.prevent="openModalForce" > <FAIcon icon="search-plus" /> </button> <button v-if="nsfw && hideNsfwLocal" class="button-unstyled attachment-button" - @click.prevent="toggleHidden" :title="$t('status.hide_attachment')" + @click.prevent="toggleHidden" > <FAIcon icon="times" /> </button> <button v-if="shiftUp" class="button-unstyled attachment-button" - @click.prevent="onShiftUp" :title="$t('status.move_up')" + @click.prevent="onShiftUp" > <FAIcon icon="chevron-left" /> </button> <button v-if="shiftDn" class="button-unstyled attachment-button" - @click.prevent="onShiftDn" :title="$t('status.move_down')" + @click.prevent="onShiftDn" > <FAIcon icon="chevron-right" /> </button> <button v-if="remove" class="button-unstyled attachment-button" - @click.prevent="onRemove" :title="$t('status.remove_attachment')" + @click.prevent="onRemove" > <FAIcon icon="trash-alt" /> </button> @@ -161,7 +161,10 @@ :href="attachment.url" target="_blank" > - <FAIcon size="5x" :icon="placeholderIconClass" /> + <FAIcon + size="5x" + :icon="placeholderIconClass" + /> <p> {{ localDescription }} </p> diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue @@ -26,8 +26,8 @@ :size="size" :editable="editable" :remove="removeAttachment" - :shiftUp="!(attachmentIndex === 0 && rowIndex === 0) && shiftUpAttachment" - :shiftDn="!(attachmentIndex === row.items.length - 1 && rowIndex === rows.length - 1) && shiftDnAttachment" + :shift-up="!(attachmentIndex === 0 && rowIndex === 0) && shiftUpAttachment" + :shift-dn="!(attachmentIndex === row.items.length - 1 && rowIndex === rows.length - 1) && shiftDnAttachment" :edit="editAttachment" :description="descriptions && descriptions[attachment.id]" :hide-description="size === 'small' || tooManyAttachments && hidingLong"