Merge pull request #2132 from pixelfed/staging

Update RemoteProfile, fix missing content warnings
This commit is contained in:
daniel 2020-04-20 20:55:34 -06:00 committed by GitHub
commit f59705310c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions

View file

@ -8,6 +8,7 @@
- Updated PostComponent, fix missing like button on comments ([132c1dce](https://github.com/pixelfed/pixelfed/commit/132c1dce))
- Updated PostComponent.vue, fix load more comments button ([847599ad](https://github.com/pixelfed/pixelfed/commit/847599ad))
- Updated 2FA Checkpoint, add username + logout button and numeric inputmode ([26affb11](https://github.com/pixelfed/pixelfed/commit/26affb11))
- Updated RemoteProfile, fix missing content warnings ([e487527a](https://github.com/pixelfed/pixelfed/commit/e487527a))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

2
public/js/rempro.js vendored

File diff suppressed because one or more lines are too long

View file

@ -22,7 +22,7 @@
"/js/profile-directory.js": "/js/profile-directory.js?id=7160b00d9beda164f1bc",
"/js/quill.js": "/js/quill.js?id=9b15ab0ae830e7293390",
"/js/rempos.js": "/js/rempos.js?id=8dafb37fda5c7977b9af",
"/js/rempro.js": "/js/rempro.js?id=e71bc833e4381e9a7655",
"/js/rempro.js": "/js/rempro.js?id=96ea5f27974ab2c52586",
"/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
"/js/status.js": "/js/status.js?id=05b227c197bc00d64851",
"/js/story-compose.js": "/js/story-compose.js?id=86751d072969424c6e30",

View file

@ -70,9 +70,23 @@
</div>
<div class="card-body p-0">
<div v-if="status.sensitive == true">
<details class="details-animated" @click="status.sensitive = false;">
<summary>
<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
<p class="font-weight-light">(click to show)</p>
</summary>
<a :href="status.url">
<img v-once :src="status.thumb" class="w-100 h-100">
</a>
</details>
</div>
<div v-else>
<a :href="status.url">
<img v-once :src="status.thumb" class="w-100 h-100">
</a>
<button v-if="status.cw == true && status.sensitive == false" class="btn btn-block btn-primary font-weight-bold rounded-0" @click="status.sensitive = true;">Hide Media</button>
</div>
</div>
@ -225,7 +239,9 @@
media: status.media_attachments,
timestamp: status.created_at,
type: status.pf_type,
url: status.url
url: status.url,
sensitive: status.sensitive,
cw: status.sensitive
}
});
let ids = data.map(status => status.id);