Skip to content

Commit

Permalink
Minor account media gallery fixes (mastodon#10695)
Browse files Browse the repository at this point in the history
* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset
  • Loading branch information
ClearlyClaire authored and hiyuki2578 committed Oct 2, 2019
1 parent 067de95 commit a7d2f04
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export default class MediaItem extends ImmutablePureComponent {

return (
<div className='account-gallery__item' style={{ width, height }}>
<a className='media-gallery__item-thumbnail' href={status.get('url')} target='_blank' style={{ cursor: 'pointer' }} onClick={this.handleClick}>
<a className='media-gallery__item-thumbnail' href={status.get('url')} target='_blank' onClick={this.handleClick}>
<canvas width={32} height={32} ref={this.setCanvasRef} className={classNames('media-gallery__preview', { 'media-gallery__preview--hidden': visible && loaded })} />
{visible && thumbnail}
</a>
Expand Down
5 changes: 3 additions & 2 deletions app/javascript/mastodon/features/ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ import {
Lists,
} from './util/async-components';
import { me } from '../../initial_state';
import { previewState } from './components/media_modal';
import { previewState as previewMediaState } from './components/media_modal';
import { previewState as previewVideoState } from './components/video_modal';

// Dummy import, to make sure that <Status /> ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles.
Expand Down Expand Up @@ -121,7 +122,7 @@ class SwitchingColumnsArea extends React.PureComponent {
}

shouldUpdateScroll (_, { location }) {
return location.state !== previewState;
return location.state !== previewMediaState && location.state !== previewVideoState;
}

handleResize = debounce(() => {
Expand Down

0 comments on commit a7d2f04

Please sign in to comment.