IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #284 from nickago/MM-1768

Browse Source 
MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
This commit is contained in:
Joram Wilander
2015-07-30 08:58:56 -04:00
parent 51e244ab5a 49b7f98709
commit e699acb808
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/react/components/setting_picture.jsx
+15 -15
View File
@@ -7,8 +7,8 @@ module.exports = React.createClass({
var reader = new FileReader();
var img = this.refs.image.getDOMNode();
reader.onload = function (e) {
$(img).attr('src', e.target.result)
reader.onload = function(e) {
$(img).attr('src', e.target.result);
};
reader.readAsDataURL(file);
@@ -25,27 +25,27 @@ module.exports = React.createClass({
var img = null;
if (this.props.picture) {
img = (<img ref="image" className="profile-img" src=""/>);
img = (<img ref='image' className='profile-img' src=''/>);
} else {
img = (<img ref="image" className="profile-img" src={this.props.src}/>);
img = (<img ref='image' className='profile-img' src={this.props.src}/>);
}
var self = this;
return (
<ul className="section-max">
<li className="col-xs-12 section-title">{this.props.title}</li>
<li className="col-xs-offset-3 col-xs-8">
<ul className="setting-list">
<li className="setting-list-item">
<ul className='section-max'>
<li className='col-xs-12 section-title'>{this.props.title}</li>
<li className='col-xs-offset-3 col-xs-8'>
<ul className='setting-list'>
<li className='setting-list-item'>
{img}
</li>
<li className="setting-list-item">
{ server_error }
{ client_error }
<span className="btn btn-sm btn-primary btn-file sel-btn">Upload<input ref="input" accept=".jpg,.png,.bmp" type="file" onChange={this.props.pictureChange}/></span>
<a className={this.props.submitActive ? "btn btn-sm btn-primary" : "btn btn-sm btn-inactive disabled"} onClick={this.props.submit}>Save</a>
<a className="btn btn-sm theme" href="#" onClick={self.props.updateSection}>Cancel</a>
<li className='setting-list-item'>
{server_error}
{client_error}
<span className='btn btn-sm btn-primary btn-file sel-btn'>Select<input ref='input' accept='.jpg,.png,.bmp' type='file' onChange={this.props.pictureChange}/></span>
<a className={this.props.submitActive ? 'btn btn-sm btn-primary' : 'btn btn-sm btn-inactive disabled'} onClick={this.props.submit}>Save</a>
<a className='btn btn-sm theme' href='#' onClick={self.props.updateSection}>Cancel</a>
</li>
</ul>
</li>