natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #6057 (#6061)

This commit is contained in:
tamaina 2020-02-22 01:03:50 +09:00 committed by GitHub
parent 3a3319ff52
commit ccc27bcc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/client/components/media-list.vue
View File

@ -40,7 +40,8 @@ export default Vue.extend({
}, },
data() { data() {
return { return {
gridInnerStyle: {} gridInnerStyle: {},
sizeWaiting: false
} }
}, },
mounted() { mounted() {
@ -59,20 +60,28 @@ export default Vue.extend({
}, },
size() { size() {
// for Safari bug // for Safari bug
if (this.$refs.gridOuter) { if (this.sizeWaiting) return;
let height = 287;
const parent = this.$props.parentElement || this.$parent.$el;
if (this.$refs.gridOuter.clientHeight) { this.sizeWaiting = true;
height = this.$refs.gridOuter.clientHeight;
} else if (parent) { window.requestAnimationFrame(() => {
height = parent.getBoundingClientRect().width * 9 / 16; this.sizeWaiting = false;
if (this.$refs.gridOuter) {
let height = 287;
const parent = this.$props.parentElement || this.$parent.$el;
if (this.$refs.gridOuter.clientHeight) {
height = this.$refs.gridOuter.clientHeight;
} else if (parent) {
height = parent.getBoundingClientRect().width * 9 / 16;
}
this.gridInnerStyle = { height: `${height}px` };
} else {
this.gridInnerStyle = {};
} }
});
this.gridInnerStyle = { height: `${height}px` };
} else {
this.gridInnerStyle = {};
}
} }
} }
}); });