chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3298 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-03-08 23:09:50 -07:00 committed by GitHub
parent 5fa521f296 a7042d99dc
commit c8d4842aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -75,6 +75,7 @@
- Updated AccountController, refresh relationship after handling follow request. ([fe768785](https://github.com/pixelfed/pixelfed/commit/fe768785))
- Updated CollectionController, fixes #3289. ([c7e1e473](https://github.com/pixelfed/pixelfed/commit/c7e1e473))
- Updated SpaController, handle web redirects. ([b6c6c85b](https://github.com/pixelfed/pixelfed/commit/b6c6c85b))
- Updated presenter components, remove video poster attribute. ([4d612dfa](https://github.com/pixelfed/pixelfed/commit/4d612dfa))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

2
public/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/rempos.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/rempro.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/status.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/mix-manifest.json
View File

@ -3,9 +3,9 @@
"/js/activity.js": "/js/activity.js?id=d14e608dd1ecac4d900cd639f2199b62",
"/js/components.js": "/js/components.js?id=8bbdcdcd1c285672e99003f724284cd8",
"/js/discover.js": "/js/discover.js?id=0c98508635d6adae9bf8f76c9f5c918c",
"/js/profile.js": "/js/profile.js?id=53a27fe393608594c2b1dd77854d57db",
"/js/status.js": "/js/status.js?id=119ed09b22f252559934e81a62c457e3",
"/js/timeline.js": "/js/timeline.js?id=8d7aae4d042be737251be2bc68b23e57",
"/js/profile.js": "/js/profile.js?id=330d89a7f95673572dba3ebd9af31f61",
"/js/status.js": "/js/status.js?id=983223808e50b639dcf545b68bcb1bca",
"/js/timeline.js": "/js/timeline.js?id=654c74552cc7456a936967374afe697f",
"/js/compose.js": "/js/compose.js?id=f408112a208d3a550f9ca578c228d78a",
"/js/compose-classic.js": "/js/compose-classic.js?id=3a53d79b046932f24a1d89592c81a4b0",
"/js/search.js": "/js/search.js?id=1ad4af345d2c8a14541a03937ea4904b",
@ -18,9 +18,9 @@
"/js/story-compose.js": "/js/story-compose.js?id=b9757f1d5a146f0d5c06c62b83c983fb",
"/js/direct.js": "/js/direct.js?id=9366e39e3bab1f1139eac9bad1037c42",
"/js/admin.js": "/js/admin.js?id=84492883e1542f8438b48dcf187fc07b",
"/js/rempro.js": "/js/rempro.js?id=7734f0f0f207cf6e147125f2f6a5700e",
"/js/rempos.js": "/js/rempos.js?id=15124ae6f97d7c583d45d56c429fc7c3",
"/js/spa.js": "/js/spa.js?id=b1425bc4596fca6320295c78bb61c937",
"/js/rempro.js": "/js/rempro.js?id=0a75c79a29b63d19b0991d99b9772990",
"/js/rempos.js": "/js/rempos.js?id=e3382c2586efc9a83e5f7af48713c573",
"/js/spa.js": "/js/spa.js?id=d292f85022ec34c8fd8dbc45bebc2778",
"/js/stories.js": "/js/stories.js?id=048de600ee6dfccaeaf06070999cb892",
"/js/manifest.js": "/js/manifest.js?id=c184fbab731dfcbfc28733252b7bdf1c",
"/js/home-chunk-uopy3z.js": "/js/home-chunk-uopy3z.js?id=2b40c3a64ecbc71b7ae7ee3b6d12d181",

4
resources/assets/js/components/presenter/MixedAlbumPresenter.vue
View File

@ -14,7 +14,7 @@
>
<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
<video v-if="media.type == 'video'" slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="media.description" width="100%" height="100%" :poster="media.preview_url">
<video v-if="media.type == 'video'" slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="media.description" width="100%" height="100%">
<source :src="media.url" :type="media.mime">
</video>
@ -53,7 +53,7 @@
<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="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="background: #000; display: flex;align-items: center;">
<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">
<video v-if="media.type == 'video'" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%">
<source :src="media.url" :type="media.mime">
</video>

4
resources/assets/js/components/presenter/VideoAlbumPresenter.vue
View File

@ -13,7 +13,7 @@
:interval="0"
>
<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%" :poster="vid.preview_url">
<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%">
<source :src="vid.url" :type="vid.mime">
</video>
</b-carousel-slide>
@ -29,7 +29,7 @@
:interval="0"
>
<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%" :poster="vid.preview_url">
<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%">
<source :src="vid.url" :type="vid.mime">
</video>
</b-carousel-slide>

2
resources/assets/js/components/presenter/VideoPresenter.vue
View File

@ -22,7 +22,7 @@
:alt="altText(status)"/>
</div>
<div v-else class="embed-responsive embed-responsive-16by9">
<video class="video" controls playsinline preload="metadata" loop :poster="status.media_attachments[0].preview_url" :data-id="status.id">
<video class="video" controls playsinline preload="metadata" loop :data-id="status.id">
<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
</video>
</div>