secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Committing to Material icons

Browse Source
This commit is contained in:
James Barnsley
2018-05-16 16:50:46 +12:00
parent c8d0d90d1a
commit eb89ac29ee
25 changed files with 25579 additions and 23662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/components/Fields/DropdownField.js
View File

@ -4,6 +4,8 @@ import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
import FontAwesome from 'react-fontawesome'
import Icon from '../Icon';
export default class DropdownField extends React.Component{
constructor(props){
@ -107,9 +109,9 @@ export default class DropdownField extends React.Component{
current_value = this.props.options[0].value;
}
var selected_icon = <FontAwesome name="check" />
var selected_icon = <Icon name="check" />
if (this.props.selected_icon){
selected_icon = <FontAwesome name={this.props.selected_icon} />
selected_icon = <Icon name={this.props.selected_icon} />
}
var options = Object.assign([], this.props.options);
@ -124,7 +126,7 @@ export default class DropdownField extends React.Component{
return (
<div className={className} data-uid={this.uid}>
<div className={"label"+(this.props.button ? " button "+this.props.button : "")} onClick={e => this.setExpanded()}>
{this.props.icon ? <span><FontAwesome name={this.props.icon} />&nbsp; </span> : null}
{this.props.icon ? <Icon name={this.props.icon} type={this.props.icon_type ? this.props.icon_type : "material"} /> : null}
<span className="text">
{this.props.name}
{this.isMultiSelect() ? ' ('+current_value.length+')' : null}