UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-25 07:45:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update album presenters, use better carousel

Browse source
This commit is contained in:
Daniel Supernault 2019-10-15 21:37:44 -06:00
parent c5577112ed
commit 31b114cc0b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 70 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/assets/js/components/presenter/MixedAlbumPresenter.vue
View file

@ -28,8 +28,8 @@
</b-carousel> </b-carousel>
</details> </details>
</div> </div>
<div v-else> <div v-else class="w-100 h-100 p-0">
<b-carousel :id="status.id + '-carousel'" <!-- <b-carousel :id="status.id + '-carousel'"
style="text-shadow: 1px 1px 2px #333; background-color: #000;" style="text-shadow: 1px 1px 2px #333; background-color: #000;"
controls controls
img-blank img-blank
@ -49,7 +49,22 @@
<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p> <p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
</b-carousel-slide> </b-carousel-slide>
</b-carousel> </b-carousel> -->
<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
<slide v-for="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="max-height: 600px;">
<video v-if="media.type == 'Video'" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%" :poster="media.preview_url">
<source :src="media.url" :type="media.mime">
</video>
<div v-else-if="media.type == 'Image'" :title="media.description">
<img :class="media.filter_class + ' img-fluid w-100'" :src="media.url" :alt="media.description" loading="lazy">
</div>
<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
</slide>
</carousel>
</div> </div>
</template> </template>

58
resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
View file

@ -1,11 +1,11 @@
<template> <template>
<div v-if="status.sensitive == true"> <div v-if="status.sensitive == true">
<details class="details-animated"> <details class="details-animated">
<summary> <summary @click="loadSensitive">
<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p> <p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
<p class="font-weight-light">(click to show)</p> <p class="font-weight-light">(click to show)</p>
</summary> </summary>
<b-carousel :id="status.id + '-carousel'" <!-- <b-carousel :id="status.id + '-carousel'"
v-model="cursor" v-model="cursor"
style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;" style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;"
controls controls
@ -20,11 +20,16 @@
<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;"> <span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
{{cursor + 1}} / {{status.media_attachments.length}} {{cursor + 1}} / {{status.media_attachments.length}}
</span> </span>
</b-carousel> </b-carousel> -->
<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="max-height: 600px;" :title="img.description">
<img :class="img.filter_class + ' img-fluid'" style="max-height: 600px;" :src="img.url" :alt="img.description">
</slide>
</carousel>
</details> </details>
</div> </div>
<div v-else> <div v-else class="w-100 h-100 p-0">
<b-carousel :id="status.id + '-carousel'" <!-- <b-carousel :id="status.id + '-carousel'"
v-model="cursor" v-model="cursor"
style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;" style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;"
controls controls
@ -39,7 +44,12 @@
<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;"> <span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
{{cursor + 1}} / {{status.media_attachments.length}} {{cursor + 1}} / {{status.media_attachments.length}}
</span> </span>
</b-carousel> </b-carousel> -->
<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0">
<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;max-height: 600px;" :title="img.description">
<img :class="img.filter_class + ' img-fluid w-100 p-0'" style="max-height: 600px;" :src="img.url" :alt="img.description">
</slide>
</carousel>
</div> </div>
</template> </template>
@ -58,6 +68,42 @@
return { return {
cursor: 0 cursor: 0
} }
},
created() {
// window.addEventListener("keydown", this.keypressNavigation);
},
beforeDestroy() {
// window.removeEventListener("keydown", this.keypressNavigation);
},
methods: {
loadSensitive() {
this.$refs.carousel.onResize();
this.$refs.carousel.goToPage(0);
},
keypressNavigation(e) {
let ref = this.$refs.carousel;
if (e.keyCode == "37") {
e.preventDefault();
let direction = "backward";
ref.advancePage(direction);
ref.$emit("navigation-click", direction);
}
if (e.keyCode == "39") {
e.preventDefault();
let direction = "forward";
ref.advancePage(direction);
ref.$emit("navigation-click", direction);
}
}
} }
} }
</script> </script>