diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-04 17:36:43 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-04 17:36:43 +0200 |
| commit | 4f73cde4e136320e9325d7f43232c5a614874388 (patch) | |
| tree | c399a6b92e57494a26511c149e14cfa0a7183d93 /app | |
| parent | c88d9e524b02cba895de9bdb7cba0e29e37703d5 (diff) | |
Minor account media gallery fixes (#10695)
* Make the cursor icon consistant across media types in account media gallery * Fix the video player modal causing scroll position to reset
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/account_gallery/components/media_item.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/index.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js index 8d462996e..5643e6449 100644 --- a/app/javascript/mastodon/features/account_gallery/components/media_item.js +++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js @@ -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> diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index c14eba992..1fcea779d 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -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. @@ -121,7 +122,7 @@ class SwitchingColumnsArea extends React.PureComponent { } shouldUpdateScroll (_, { location }) { - return location.state !== previewState; + return location.state !== previewMediaState && location.state !== previewVideoState; } handleResize = debounce(() => { |