Merge branch 'master' into bug/3329-duplicate-css

# Conflicts:
#	make-webpack-config.js
This commit is contained in:
Owen Conti
2017-07-17 18:49:19 -06:00
41 changed files with 629 additions and 167 deletions

View File

@@ -6,6 +6,10 @@ import Logo from "./logo_small.png"
export default class Topbar extends React.Component {
static propTypes = {
layoutActions: PropTypes.object.isRequired
}
constructor(props, context) {
super(props, context)
this.state = { url: props.specSelectors.url(), selectedIndex: 0 }
@@ -80,6 +84,11 @@ export default class Topbar extends React.Component {
}
}
onFilterChange =(e) => {
let {target: {value}} = e
this.props.layoutActions.updateFilter(value)
}
render() {
let { getComponent, specSelectors, getConfigs } = this.props
const Button = getComponent("Button")