summaryrefslogtreecommitdiffstats
path: root/web/react/components/setting_upload.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-26 15:24:17 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-26 15:24:17 -0400
commit1ed6718dd964d418ac279e89bba87d346f8aad20 (patch)
tree1b1fb92fc4e25d3f079de21906f4a8da3e2cda0e /web/react/components/setting_upload.jsx
parent378f0b52c10d3b9dc670da34a0043b7e05f3e93c (diff)
downloadchat-1ed6718dd964d418ac279e89bba87d346f8aad20.tar.gz
chat-1ed6718dd964d418ac279e89bba87d346f8aad20.tar.bz2
chat-1ed6718dd964d418ac279e89bba87d346f8aad20.zip
Improvements to import UI
Diffstat (limited to 'web/react/components/setting_upload.jsx')
-rw-r--r--web/react/components/setting_upload.jsx18
1 files changed, 3 insertions, 15 deletions
diff --git a/web/react/components/setting_upload.jsx b/web/react/components/setting_upload.jsx
index 02789f5dd..596324308 100644
--- a/web/react/components/setting_upload.jsx
+++ b/web/react/components/setting_upload.jsx
@@ -8,7 +8,8 @@ module.exports = React.createClass({
submit: React.PropTypes.func.isRequired,
fileTypesAccepted: React.PropTypes.string.isRequired,
clientError: React.PropTypes.string,
- serverError: React.PropTypes.string
+ serverError: React.PropTypes.string,
+ helpText: React.PropTypes.string
},
getInitialState: function() {
return {
@@ -38,14 +39,6 @@ module.exports = React.createClass({
this.setState({clientError: 'No file selected.'});
}
},
- doCancel: function(e) {
- e.preventDefault();
- this.refs.uploadinput.getDOMNode().value = '';
- this.setState({
- clientError: '',
- serverError: ''
- });
- },
onFileSelect: function(e) {
var filename = $(e.target).val();
if (filename.substring(3, 11) === 'fakepath') {
@@ -70,6 +63,7 @@ module.exports = React.createClass({
return (
<ul className='section-max'>
<li className='col-xs-12 section-title'>{this.props.title}</li>
+ <li className='col-xs-offset-3'>{this.props.helpText}</li>
<li className='col-xs-offset-3 col-xs-8'>
<ul className='setting-list'>
<li className='setting-list-item'>
@@ -79,12 +73,6 @@ module.exports = React.createClass({
onClick={this.doSubmit}>
Import
</a>
- <a
- className='btn btn-sm btn-link theme'
- href='#'
- onClick={this.doCancel}>
- Cancel
- </a>
<div className='file-status file-name hide'></div>
{serverError}
{clientError}