diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-05 17:13:05 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-05 17:13:44 +0100 |
| commit | 64d109dc0e39574d4ed45f2443ee132dfb761033 (patch) | |
| tree | a4cc21a6137701c0853d08c8283e2dca38d63787 | |
| parent | a910cdd54d3e3fa04b00c4cdf9398e1595dce5a0 (diff) | |
Downsize originals in media attachments, small fixes
| -rw-r--r-- | app/assets/javascripts/components/actions/compose.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/components/media_gallery.jsx | 2 | ||||
| -rw-r--r-- | app/models/media_attachment.rb | 2 | ||||
| -rw-r--r-- | app/views/api/v1/statuses/_media.rabl | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx index 23bcf8eac..ec5465381 100644 --- a/app/assets/javascripts/components/actions/compose.jsx +++ b/app/assets/javascripts/components/actions/compose.jsx @@ -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) { diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx index d04c7c869..9aafd8181 100644 --- a/app/assets/javascripts/components/components/media_gallery.jsx +++ b/app/assets/javascripts/components/components/media_gallery.jsx @@ -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> ); }); diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index d37ef99a8..7214ab880 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -44,7 +44,7 @@ class MediaAttachment < ApplicationRecord def file_styles(f) if f.instance.image? { - original: '100%', + original: '1280x1280>', small: '510x680>', } else diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl index af635dfec..5c6be1ce7 100644 --- a/app/views/api/v1/statuses/_media.rabl +++ b/app/views/api/v1/statuses/_media.rabl @@ -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)) } |