IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #244 from rgarmsen2295/mm-1610

Browse Source 
MM-1610 Fixed issue with error message for uploading more than 5 files not appearing on OSX
This commit is contained in:
Christopher Speller
2015-07-23 14:56:53 -04:00
parent a9d48ff994 952e7a93f9
commit 772e644343
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/react/components/create_comment.jsx
View File

@@ -40,7 +40,7 @@ module.exports = React.createClass({
post.parent_id = this.props.parentId;
post.filenames = this.state.previews;
this.setState({ submitting: true });
this.setState({ submitting: true, limit_error: null });
client.createPost(post, ChannelStore.getCurrent(),
function(data) {

2
web/react/components/create_post.jsx
View File

@@ -45,7 +45,7 @@ module.exports = React.createClass({
return;
}
this.setState({ submitting: true });
this.setState({ submitting: true, limit_error: null });
var user_id = UserStore.getCurrentId();

2
web/react/components/file_upload.jsx
View File

@@ -15,7 +15,7 @@ module.exports = React.createClass({
// This looks redundant, but must be done this way due to
// setState being an asynchronous call
var numFiles = 0;
for(var i = 0; i < files.length && i < Constants.MAX_UPLOAD_FILES; i++) {
for(var i = 0; i < files.length; i++) {
if (files[i].size <= Constants.MAX_FILE_SIZE) {
numFiles++;
}