summaryrefslogtreecommitdiffstats
path: root/webapp/components/setting_upload.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-18 09:28:18 -0400
committerGitHub <noreply@github.com>2017-05-18 09:28:18 -0400
commit2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch)
treec97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/setting_upload.jsx
parent63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff)
downloadchat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip
Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json
Diffstat (limited to 'webapp/components/setting_upload.jsx')
-rw-r--r--webapp/components/setting_upload.jsx14
1 files changed, 8 insertions, 6 deletions
diff --git a/webapp/components/setting_upload.jsx b/webapp/components/setting_upload.jsx
index d6055ef08..3f2af309a 100644
--- a/webapp/components/setting_upload.jsx
+++ b/webapp/components/setting_upload.jsx
@@ -5,6 +5,8 @@ import $ from 'jquery';
import ReactDOM from 'react-dom';
import {FormattedMessage} from 'react-intl';
+import PropTypes from 'prop-types';
+
import React from 'react';
export default class SettingsUpload extends React.Component {
@@ -118,10 +120,10 @@ export default class SettingsUpload extends React.Component {
}
SettingsUpload.propTypes = {
- title: React.PropTypes.string.isRequired,
- submit: React.PropTypes.func.isRequired,
- fileTypesAccepted: React.PropTypes.string.isRequired,
- clientError: React.PropTypes.string,
- serverError: React.PropTypes.string,
- helpText: React.PropTypes.object
+ title: PropTypes.string.isRequired,
+ submit: PropTypes.func.isRequired,
+ fileTypesAccepted: PropTypes.string.isRequired,
+ clientError: PropTypes.string,
+ serverError: PropTypes.string,
+ helpText: PropTypes.object
};