tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding media controller, 1 webm/compose form allowed, previews generated

Browse Source
This commit is contained in:
Eugen Rochko
2016-09-17 17:47:26 +02:00
parent 183a23943b
commit bd5ad304ba
7 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/components/status.jsx
View File

@@ -40,8 +40,9 @@ const Status = React.createClass({
if (e.button === 0) {
e.preventDefault();
hashHistory.push(`/accounts/${id}`);
e.stopPropagation();
}
e.stopPropagation();
},
render () {

4
app/assets/javascripts/components/components/upload_form.jsx
View File

@@ -25,9 +25,11 @@ const UploadForm = React.createClass({
);
}.bind(this));
const noMoreAllowed = (this.props.media.some(m => m.get('type') === 'video')) || (this.props.media.size > 3);
return (
<div style={{ marginBottom: '20px', padding: '10px', paddingTop: '0' }}>
<UploadButton onSelectFile={this.props.onSelectFile} disabled={this.props.is_uploading || this.props.media.size > 3} />
<UploadButton onSelectFile={this.props.onSelectFile} disabled={this.props.is_uploading || noMoreAllowed } />
<div style={{ marginTop: '10px', overflow: 'hidden' }}>
{uploads}