summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-23 10:01:19 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-07-23 10:01:19 -0700
commit952e7a93f977a11bd65c0477d478154e1faddc15 (patch)
tree4d14225401512765344701b1f61ac838f621a130 /web
parentdc79707787b521ea5fc0d9088ccd9069780c8e0c (diff)
downloadchat-952e7a93f977a11bd65c0477d478154e1faddc15.tar.gz
chat-952e7a93f977a11bd65c0477d478154e1faddc15.tar.bz2
chat-952e7a93f977a11bd65c0477d478154e1faddc15.zip
Fixed issue with error message for uploading more than 5 files not appearing on OSX
Diffstat (limited to 'web')
-rw-r--r--web/react/components/create_comment.jsx2
-rw-r--r--web/react/components/create_post.jsx2
-rw-r--r--web/react/components/file_upload.jsx2
3 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 3f8e9ed2e..88c01c586 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -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) {
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 91d070958..b065dff83 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -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();
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index f2429f17e..aee089dbc 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -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++;
}