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
2 changes: 1 addition & 1 deletion src/avatar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let Avatar = React.createClass({
size,
src,
style,
...other
...other,
} = this.props;

let styles = {
Expand Down
14 changes: 9 additions & 5 deletions src/before-after-wrapper.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ let BeforeAfterWrapper = React.createClass({
beforeElementType,
afterElementType,
elementType,
...other
...other,
} = this.props;

let beforeElement, afterElement;
Expand All @@ -73,12 +73,16 @@ let BeforeAfterWrapper = React.createClass({

if (this.props.beforeStyle) beforeElement =
React.createElement(this.props.beforeElementType,
{style: this.mergeAndPrefix(beforeStyle, this.props.beforeStyle),
key: "::before"});
{
style: this.mergeAndPrefix(beforeStyle, this.props.beforeStyle),
key: "::before",
});
if (this.props.afterStyle) afterElement =
React.createElement(this.props.afterElementType,
{style: this.mergeAndPrefix(afterStyle, this.props.afterStyle),
key: "::after"});
{
style: this.mergeAndPrefix(afterStyle, this.props.afterStyle),
key: "::after",
});

let children = [beforeElement, this.props.children, afterElement];

Expand Down
2 changes: 1 addition & 1 deletion src/card/card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let Card = React.createClass({
lastElement.type.displayName === "CardTitle");
let {
style,
...other
...other,
} = this.props;

let mergedStyles = this.mergeAndPrefix({
Expand Down
2 changes: 1 addition & 1 deletion src/checkbox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ let Checkbox = React.createClass({
onCheck,
checkedIcon,
unCheckedIcon,
...other
...other,
} = this.props;

let styles = this.getStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/circular-progress.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ let CircularProgress = React.createClass({
style,
innerStyle,
size,
...other
...other,
} = this.props;


Expand Down
2 changes: 1 addition & 1 deletion src/clearfix.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let ClearFix = React.createClass({
render() {
let {
style,
...other
...other,
} = this.props;

let before = function() {
Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/date-display.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ let DateDisplay = React.createClass({
let {
selectedDate,
style,
...other
...other,
} = this.props;
let dayOfWeek = DateTime.getDayOfWeek(this.props.selectedDate);
let month = DateTime.getShortMonth(this.props.selectedDate);
Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/date-picker-dialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ let DatePickerDialog = React.createClass({
initialDate,
onAccept,
style,
...other
...other,
} = this.props;

let styles = {
Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/date-picker.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ let DatePicker = React.createClass({
showYearSelector,
style,
textFieldStyle,
...other
...other,
} = this.props;
let defaultInputValue;

Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/day-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ let DayButton = React.createClass({
date,
onTouchTap,
selected,
...other
...other,
} = this.props;

let styles = {
Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/year-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let YearButton = React.createClass({
year,
onTouchTap,
selected,
...other
...other,
} = this.props;

let styles = {
Expand Down
2 changes: 1 addition & 1 deletion src/drop-down-icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ let DropDownIcon = React.createClass({
closeOnMenuItemTouchTap,
iconStyle,
iconClassName,
...other
...other,
} = this.props;

let styles = this.getStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/enhanced-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ let EnhancedButton = React.createClass({
style,
tabIndex,
type,
...other
...other,
} = this.props;

let mergedStyles = this.mergeAndPrefix({
Expand Down
6 changes: 3 additions & 3 deletions src/enhanced-switch.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ let EnhancedSwitch = React.createClass({
},

windowListeners: {
'keydown': '_handleWindowKeydown',
'keyup': '_handleWindowKeyup',
keydown: '_handleWindowKeydown',
keyup: '_handleWindowKeyup',
},

getInitialState() {
Expand Down Expand Up @@ -186,7 +186,7 @@ let EnhancedSwitch = React.createClass({
disableTouchRipple,
disableFocusRipple,
className,
...other
...other,
} = this.props;

let styles = this.getStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/enhanced-textarea.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let EnhancedTextarea = React.createClass({
style,
textareaStyle,
valueLink,
...other
...other,
} = this.props;

let styles = this.getStyles().root;
Expand Down
2 changes: 1 addition & 1 deletion src/flat-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let FlatButton = React.createClass({
rippleColor,
secondary,
style,
...other
...other,
} = this.props;

let theme = this.context.muiTheme;
Expand Down
2 changes: 1 addition & 1 deletion src/font-icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let FontIcon = React.createClass({
onMouseOut,
onMouseOver,
style,
...other
...other,
} = this.props;

let spacing = this.context.muiTheme.spacing;
Expand Down
5 changes: 3 additions & 2 deletions src/icon-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ let IconButton = React.createClass({
tooltip,
touch,
iconStyle,
...other } = this.props;
...other,
} = this.props;
let fonticon;

let styles = this.getStyles();
Expand All @@ -113,7 +114,7 @@ let IconButton = React.createClass({
if (iconClassName) {
let {
iconHoverColor,
...iconStyleFontIcon
...iconStyleFontIcon,
} = iconStyle;

fonticon = (
Expand Down
2 changes: 1 addition & 1 deletion src/linear-progress.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ let LinearProgress = React.createClass({
render() {
let {
style,
...other
...other,
} = this.props;

let styles = this.getStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/lists/list-divider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let ListDivider = React.createClass({
let {
inset,
style,
...other
...other,
} = this.props;

let mergedStyles = this.mergeAndPrefix({
Expand Down
2 changes: 1 addition & 1 deletion src/lists/list-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ let ListItem = React.createClass({
secondaryText,
secondaryTextLines,
style,
...other
...other,
} = this.props;

let textColor = this.context.muiTheme.palette.textColor;
Expand Down
2 changes: 1 addition & 1 deletion src/lists/list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let List = React.createClass({
subheader,
subheaderStyle,
zDepth,
...other
...other,
} = this.props;

let styles = {
Expand Down
2 changes: 1 addition & 1 deletion src/menu/menu-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ let MenuItem = React.createClass({
children,
label,
style,
...other
...other,
} = this.props;
toggleElement = <Toggle {...other} onToggle={this._handleToggle} style={styles.toggle}/>;
}
Expand Down
6 changes: 3 additions & 3 deletions src/menu/menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ var NestedMenuItem = React.createClass({
let {
index,
menuItemStyle,
...other
...other,
} = this.props;

return (
Expand Down Expand Up @@ -330,7 +330,7 @@ var Menu = React.createClass({
number,
toggle,
onTouchTap,
...other
...other,
} = menuItem;

switch (menuItem.type) {
Expand Down Expand Up @@ -368,7 +368,7 @@ var Menu = React.createClass({
key,
index,
zDepth,
...other
...other,
} = this.props;

itemComponent = (
Expand Down
2 changes: 1 addition & 1 deletion src/menus/icon-menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ let IconMenu = React.createClass({
onTouchTap,
menuStyle,
style,
...other
...other,
} = this.props;

let open = this.state.open;
Expand Down
2 changes: 1 addition & 1 deletion src/menus/menu-divider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let MenuDivider = React.createClass({
render() {
let {
style,
...other
...other,
} = this.props;

let mergedStyles = this.mergeAndPrefix({
Expand Down
2 changes: 1 addition & 1 deletion src/menus/menu-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let MenuItem = React.createClass({
secondaryText,
style,
value,
...other
...other,
} = this.props;

let disabledColor = this.context.muiTheme.palette.disabledColor;
Expand Down
10 changes: 5 additions & 5 deletions src/menus/menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ let Menu = React.createClass({
valueLink,
width,
zDepth,
...other
...other,
} = this.props;

let componentEntered = this.state.componentEntered;
Expand Down Expand Up @@ -221,7 +221,7 @@ let Menu = React.createClass({

let {
desktop,
selectedMenuItemStyle
selectedMenuItemStyle,
} = this.props;

let selected = this._isChildSelected(child);
Expand All @@ -233,7 +233,7 @@ let Menu = React.createClass({

let mergedChildrenStyles = this.mergeStyles(
child.props.style || {},
selectedChildrenStyles
selectedChildrenStyles,
);

let isFocused = childIndex === this.state.focusIndex;
Expand Down Expand Up @@ -268,7 +268,7 @@ let Menu = React.createClass({
let {
children,
desktop,
maxHeight
maxHeight,
} = this.props;
let count = 1;
let currentHeight = desktop ? 16 : 8;
Expand Down Expand Up @@ -304,7 +304,7 @@ let Menu = React.createClass({

_getSelectedIndex() {
let {
children
children,
} = this.props;
let selectedIndex = -1;
let menuItemIndex = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/overlay.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ let Overlay = React.createClass({
let {
show,
style,
...other
...other,
} = this.props;

let styles = this.mergeAndPrefix(this.getStyles().root, this.props.style, this.props.show && this.getStyles().rootWhenShown);
Expand Down
2 changes: 1 addition & 1 deletion src/radio-button-group.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ let RadioButtonGroup = React.createClass({
value,
label,
onCheck,
...other
...other,
} = option.props;

return <RadioButton
Expand Down
2 changes: 1 addition & 1 deletion src/radio-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ let RadioButton = React.createClass({
render() {
let {
onCheck,
...other
...other,
} = this.props;

let styles = this.getStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/ripples/circle-ripple.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let CircleRipple = React.createClass({
started,
ending,
style,
...other
...other,
} = this.props;

let styles = this.mergeAndPrefix({
Expand Down
2 changes: 1 addition & 1 deletion src/select-field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ let SelectField = React.createClass({
floatingLabelText,
hintText,
fullWidth,
...other
...other,
} = this.props;

let textFieldProps = {
Expand Down
Loading