Skip to content

Commit

Permalink
Merge pull request #250 from jcouyang/custom-icon-in-appbar
Browse files Browse the repository at this point in the history
Fixes #184 - add support for custom icon in appbar
  • Loading branch information
hai-cea committed Jan 19, 2015
2 parents ea77599 + 2d4824a commit 2942da9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/js/app-bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var AppBar = React.createClass({
onMenuIconButtonTouchTap: React.PropTypes.func,
showMenuIconButton: React.PropTypes.bool,
title : React.PropTypes.string,
icon: React.PropTypes.string,
zDepth: React.PropTypes.number
},

Expand All @@ -34,7 +35,7 @@ var AppBar = React.createClass({
menuIconButton = (
<IconButton
className="mui-app-bar-navigation-icon-button"
icon="navigation-menu"
icon={ this.props.icon || "navigation-menu"}
onTouchTap={this._onMenuIconButtonTouchTap}
/>
);
Expand All @@ -55,4 +56,4 @@ var AppBar = React.createClass({

});

module.exports = AppBar;
module.exports = AppBar;

0 comments on commit 2942da9

Please sign in to comment.