balkan/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add media_expand setting

Browse source
This commit is contained in:
KMY 2023-04-07 21:36:35 +09:00
parent dc4dca177e
commit 8719715e27
9 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
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';
@ -357,13 +357,16 @@ class MediaGallery extends React.PureComponent {
style.height = height;
}
const size = media.take(8).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(8).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) {

2
app/javascript/mastodon/initial_state.js
View file

@ -56,6 +56,7 @@
* @property {boolean=} disable_swiping
* @property {string=} disabled_account_id
* @property {boolean} display_media
* @property {boolean} display_media_expand
* @property {string} domain
* @property {boolean=} expand_spoilers
* @property {boolean} limited_federation_mode
@ -108,6 +109,7 @@ export const deleteModal = getMeta('delete_modal');
export const disableSwiping = getMeta('disable_swiping');
export const disabledAccountId = getMeta('disabled_account_id');
export const displayMedia = getMeta('display_media');
export const displayMediaExpand = getMeta('display_media_expand');
export const domain = getMeta('domain');
export const expandSpoilers = getMeta('expand_spoilers');
export const forceSingleColumn = !getMeta('advanced_layout');