erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Downsize originals in media attachments, small fixes

Browse source
This commit is contained in:
Eugen Rochko 2016-12-05 17:13:05 +01:00
parent a910cdd54d
commit 64d109dc0e
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/actions/compose.jsx
View file

@ -74,7 +74,7 @@ export function submitCompose() {
// To make the app more responsive, immediately get the status into the columns
dispatch(updateTimeline('home', { ...response.data }));
if (response.data.in_reply_to_id === null) {
if (response.data.in_reply_to_id === null && !getState().getIn(['compose', 'unlisted'])) {
dispatch(updateTimeline('public', { ...response.data }));
}
}).catch(function (error) {

2
app/assets/javascripts/components/components/media_gallery.jsx
View file

@ -129,7 +129,7 @@ const MediaGallery = React.createClass({
return (
<div key={attachment.get('id')} style={{ boxSizing: 'border-box', position: 'relative', left: left, top: top, right: right, bottom: bottom, float: 'left', border: 'none', display: 'block', width: `${width}%`, height: `${height}%` }}>
<a href={attachment.get('url')} onClick={this.handleClick.bind(this, attachment.get('url'))} target='_blank' style={{ display: 'block', width: '100%', height: '100%', background: `url(${attachment.get('preview_url')}) no-repeat center`, textDecoration: 'none', backgroundSize: 'cover', cursor: 'zoom-in' }} />
<a href={attachment.get('remote_url') ? attachment.get('remote_url') : attachment.get('url')} onClick={this.handleClick.bind(this, attachment.get('url'))} target='_blank' style={{ display: 'block', width: '100%', height: '100%', background: `url(${attachment.get('preview_url')}) no-repeat center`, textDecoration: 'none', backgroundSize: 'cover', cursor: 'zoom-in' }} />
</div>
);
});

2
app/models/media_attachment.rb
View file

@ -44,7 +44,7 @@ class MediaAttachment < ApplicationRecord
def file_styles(f)
if f.instance.image?
{
original: '100%',
original: '1280x1280>',
small: '510x680>',
}
else

4
app/views/api/v1/statuses/_media.rabl
View file

@ -1,4 +1,4 @@
attributes :id, :remote_url, :type
node(:url) { |media| full_asset_url(media.file.url( :original)) }
node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }
node(:url) { |media| full_asset_url(media.file.url(:original)) }
node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }