gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-07 21:45:07 +09:00
commit 3d53a47905
20 changed files with 63 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/javascript/mastodon/components/media_gallery.jsx
View file

@ -5,7 +5,7 @@ import { is } from 'immutable';
import IconButton from './icon_button';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_state';
import { autoPlayGif, cropImages, displayMedia, displayMediaExpand, useBlurhash } from '../initial_state';
import { debounce } from 'lodash';
import Blurhash from 'mastodon/components/blurhash';
@ -96,6 +96,16 @@ class Item extends React.PureComponent {
height = 50;
}
if (size === 5 || size === 6) {
height = 33;
}
if (size === 7 || size === 8) {
height = 25;
}
if ((size === 5 && index === 4) || (size === 7 && index === 6)) {
width = 100;
}
if (size === 2) {
if (index === 0) {
right = '2px';
@ -128,6 +138,21 @@ class Item extends React.PureComponent {
} else {
top = '2px';
}
} else {
if (index % 2 === 0) {
right = '2px';
}
if (index % 2 === 1) {
left = '2px';
}
if (index >= 2) {
top = '2px';
}
if (index < size - 1) {
bottom = '2px';
}
}
let thumbnail = '';
@ -331,13 +356,16 @@ class MediaGallery extends React.PureComponent {
style.height = height;
}
const size = media.take(4).size;
const maxSize = displayMediaExpand ? 8 : 4;
console.log(displayMediaExpand);
const size = media.take(maxSize).size;
const uncached = media.every(attachment => attachment.get('type') === 'unknown');
if (standalone && this.isFullSizeEligible()) {
children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
} else {
children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
children = media.take(maxSize).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
}
if (uncached) {