Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/date-picker/date-display.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,19 +192,19 @@ var DateDisplay = React.createClass({
<SlideInTransitionGroup
style={styles.month.root}
direction={this.state.transitionDirection}>
<div key={month} style={styles.month.title} onClick={this._handleMonthDayClick}>{month}</div>
<div key={month} style={styles.month.title} onTouchTap={this._handleMonthDayClick}>{month}</div>
</SlideInTransitionGroup>

<SlideInTransitionGroup
style={styles.day.root}
direction={this.state.transitionDirection}>
<div key={day} style={styles.day.title} onClick={this._handleMonthDayClick}>{day}</div>
<div key={day} style={styles.day.title} onTouchTap={this._handleMonthDayClick}>{day}</div>
</SlideInTransitionGroup>

<SlideInTransitionGroup
style={styles.year.root}
direction={this.state.transitionDirection}>
<div key={year} style={styles.year.title} onClick={this._handleYearClick}>{year}</div>
<div key={year} style={styles.year.title} onTouchTap={this._handleYearClick}>{year}</div>
</SlideInTransitionGroup>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/drop-down-icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var DropDownIcon = React.createClass({

return (
<div {...other} style={this.mergeAndPrefix(styles.root, this.props.style)}>
<div onClick={this._onControlClick}>
<div onTouchTap={this._onControlClick}>
<FontIcon
className={iconClassName}
style={iconStyle}/>
Expand All @@ -88,7 +88,7 @@ var DropDownIcon = React.createClass({
menuItemStyle={styles.menuItem}
hideable={true}
visible={this.state.open}
onItemClick={this._onMenuItemClick} />
onItemTap={this._onMenuItemClick} />
</div>
);
},
Expand Down
4 changes: 2 additions & 2 deletions src/drop-down-menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ var DropDownMenu = React.createClass({
this.state.open && styles.rootWhenOpen,
this.props.style)} >

<ClearFix style={this.mergeAndPrefix(styles.control)} onClick={this._onControlClick}>
<ClearFix style={this.mergeAndPrefix(styles.control)} onTouchTap={this._onControlClick}>
<Paper style={this.mergeAndPrefix(styles.controlBg)} zDepth={0} />
<div style={this.mergeAndPrefix(styles.label, this.state.open && styles.labelWhenOpen)}>
{this.props.menuItems[this.state.selectedIndex].text}
Expand All @@ -160,7 +160,7 @@ var DropDownMenu = React.createClass({
menuItemStyle={this.mergeAndPrefix(styles.menuItem, this.props.menuItemStyle)}
hideable={true}
visible={this.state.open}
onItemClick={this._onMenuItemClick} />
onItemTap={this._onMenuItemClick} />
</div>
);
},
Expand Down
2 changes: 1 addition & 1 deletion src/left-nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ var LeftNav = React.createClass({
menuItemStyleLink={this.mergeAndPrefix(styles.menuItemLink)}
menuItemStyleSubheader={this.mergeAndPrefix(styles.menuItemSubheader)}
selectedIndex={selectedIndex}
onItemClick={this._onMenuItemClick} />
onItemTap={this._onMenuItemClick} />
</Paper>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/menu/link-menu-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ var LinkMenuItem = React.createClass({
}
});

module.exports = LinkMenuItem;
module.exports = LinkMenuItem;
2 changes: 1 addition & 1 deletion src/menu/menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var NestedMenuItem = React.createClass({
disabled={this.props.disabled}
iconRightStyle={iconCustomArrowDropRight}
iconRightClassName="muidocs-icon-custom-arrow-drop-right"
onClick={this._onParentItemClick}>
onTouchTap={this._onParentItemClick}>
{this.props.text}
</MenuItem>
<Menu {...other}
Expand Down
2 changes: 1 addition & 1 deletion src/slider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ var Slider = React.createClass({
<span className="mui-input-description">{this.props.description}</span>
<span className="mui-input-error">{this.props.error}</span>
<div style={sliderStyles}
onClick={this._onClick}
onTouchTap={this._onClick}
onFocus={this._onFocus}
onBlur={this._onBlur}
onMouseOver={this._onMouseOver}
Expand Down