Merge remote-tracking branch 'upstream/master' into dropdownmenu-spacing

mui · Jul 11, 2015 · 8fb0c6c · 8fb0c6c
2 parents 48a8a89 + b104a51
commit 8fb0c6c
Show file tree

Hide file tree

Showing 44 changed files with 65 additions and 60 deletions.
diff --git a/src/avatar.jsx b/src/avatar.jsx
@@ -36,7 +36,7 @@ let Avatar = React.createClass({
       size,
       src,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {

diff --git a/src/before-after-wrapper.jsx b/src/before-after-wrapper.jsx
@@ -63,7 +63,7 @@ let BeforeAfterWrapper = React.createClass({
       beforeElementType,
       afterElementType,
       elementType,
-      ...other
+      ...other,
     } = this.props;
 
     let beforeElement, afterElement;
@@ -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];
 

diff --git a/src/card/card.jsx b/src/card/card.jsx
@@ -21,7 +21,7 @@ let Card = React.createClass({
       lastElement.type.displayName === "CardTitle");
     let {
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let mergedStyles = this.mergeAndPrefix({

diff --git a/src/checkbox.jsx b/src/checkbox.jsx
@@ -88,7 +88,7 @@ let Checkbox = React.createClass({
       onCheck,
       checkedIcon,
       unCheckedIcon,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();

diff --git a/src/circular-progress.jsx b/src/circular-progress.jsx
@@ -154,7 +154,7 @@ let CircularProgress = React.createClass({
       style,
       innerStyle,
       size,
-      ...other
+      ...other,
     } = this.props;
 
 

diff --git a/src/clearfix.jsx b/src/clearfix.jsx
@@ -7,7 +7,7 @@ let ClearFix = React.createClass({
   render() {
     let {
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let before = function() {

diff --git a/src/date-picker/date-display.jsx b/src/date-picker/date-display.jsx
@@ -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);

diff --git a/src/date-picker/date-picker-dialog.jsx b/src/date-picker/date-picker-dialog.jsx
@@ -45,7 +45,7 @@ let DatePickerDialog = React.createClass({
       initialDate,
       onAccept,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {

diff --git a/src/date-picker/date-picker.jsx b/src/date-picker/date-picker.jsx
@@ -68,7 +68,7 @@ let DatePicker = React.createClass({
       showYearSelector,
       style,
       textFieldStyle,
-      ...other
+      ...other,
     } = this.props;
     let defaultInputValue;
 

diff --git a/src/date-picker/day-button.jsx b/src/date-picker/day-button.jsx
@@ -42,7 +42,7 @@ let DayButton = React.createClass({
       date,
       onTouchTap,
       selected,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {

diff --git a/src/date-picker/year-button.jsx b/src/date-picker/year-button.jsx
@@ -39,7 +39,7 @@ let YearButton = React.createClass({
       year,
       onTouchTap,
       selected,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {

diff --git a/src/drop-down-icon.jsx b/src/drop-down-icon.jsx
@@ -81,7 +81,7 @@ let DropDownIcon = React.createClass({
       closeOnMenuItemTouchTap,
       iconStyle,
       iconClassName,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();

diff --git a/src/enhanced-button.jsx b/src/enhanced-button.jsx
@@ -107,7 +107,7 @@ let EnhancedButton = React.createClass({
       style,
       tabIndex,
       type,
-      ...other
+      ...other,
     } = this.props;
 
     let mergedStyles = this.mergeAndPrefix({

diff --git a/src/enhanced-switch.jsx b/src/enhanced-switch.jsx
@@ -43,8 +43,8 @@ let EnhancedSwitch = React.createClass({
     },
 
   windowListeners: {
-    'keydown': '_handleWindowKeydown',
-    'keyup': '_handleWindowKeyup',
+    keydown: '_handleWindowKeydown',
+    keyup: '_handleWindowKeyup',
   },
 
   getInitialState() {
@@ -186,7 +186,7 @@ let EnhancedSwitch = React.createClass({
       disableTouchRipple,
       disableFocusRipple,
       className,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();

diff --git a/src/enhanced-textarea.jsx b/src/enhanced-textarea.jsx
@@ -51,7 +51,7 @@ let EnhancedTextarea = React.createClass({
       style,
       textareaStyle,
       valueLink,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles().root;

diff --git a/src/flat-button.jsx b/src/flat-button.jsx
@@ -64,7 +64,7 @@ let FlatButton = React.createClass({
       rippleColor,
       secondary,
       style,
-      ...other
+      ...other,
       } = this.props;
 
     let theme = this.context.muiTheme;

diff --git a/src/font-icon.jsx b/src/font-icon.jsx
@@ -31,7 +31,7 @@ let FontIcon = React.createClass({
       onMouseOut,
       onMouseOver,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let spacing = this.context.muiTheme.spacing;

diff --git a/src/icon-button.jsx b/src/icon-button.jsx
@@ -93,7 +93,8 @@ let IconButton = React.createClass({
       tooltip,
       touch,
       iconStyle,
-      ...other } = this.props;
+      ...other,
+    } = this.props;
     let fonticon;
 
     let styles = this.getStyles();
@@ -113,7 +114,7 @@ let IconButton = React.createClass({
     if (iconClassName) {
       let {
         iconHoverColor,
-        ...iconStyleFontIcon
+        ...iconStyleFontIcon,
       } = iconStyle;
 
       fonticon = (

diff --git a/src/linear-progress.jsx b/src/linear-progress.jsx
@@ -132,7 +132,7 @@ let LinearProgress = React.createClass({
   render() {
     let {
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();

diff --git a/src/lists/list-divider.jsx b/src/lists/list-divider.jsx
@@ -18,7 +18,7 @@ let ListDivider = React.createClass({
     let {
       inset,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let mergedStyles = this.mergeAndPrefix({

diff --git a/src/lists/list-item.jsx b/src/lists/list-item.jsx
@@ -88,7 +88,7 @@ let ListItem = React.createClass({
       secondaryText,
       secondaryTextLines,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let textColor = this.context.muiTheme.palette.textColor;

diff --git a/src/lists/list.jsx b/src/lists/list.jsx
@@ -32,7 +32,7 @@ let List = React.createClass({
       subheader,
       subheaderStyle,
       zDepth,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {

diff --git a/src/menu/menu-item.jsx b/src/menu/menu-item.jsx
@@ -140,7 +140,7 @@ let MenuItem = React.createClass({
         children,
         label,
         style,
-        ...other
+        ...other,
       } = this.props;
       toggleElement = <Toggle {...other} onToggle={this._handleToggle} style={styles.toggle}/>;
     }

diff --git a/src/menu/menu.jsx b/src/menu/menu.jsx
@@ -116,7 +116,7 @@ var NestedMenuItem = React.createClass({
     let {
       index,
       menuItemStyle,
-      ...other
+      ...other,
     } = this.props;
 
     return (
@@ -330,7 +330,7 @@ var Menu = React.createClass({
         number,
         toggle,
         onTouchTap,
-        ...other
+        ...other,
       } = menuItem;
 
       switch (menuItem.type) {
@@ -368,7 +368,7 @@ var Menu = React.createClass({
             key,
             index,
             zDepth,
-            ...other
+            ...other,
           } = this.props;
 
           itemComponent = (

diff --git a/src/menus/icon-menu.jsx b/src/menus/icon-menu.jsx
@@ -79,7 +79,7 @@ let IconMenu = React.createClass({
       onTouchTap,
       menuStyle,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let open = this.state.open;

diff --git a/src/menus/menu-divider.jsx b/src/menus/menu-divider.jsx
@@ -13,7 +13,7 @@ let MenuDivider = React.createClass({
   render() {
     let {
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let mergedStyles = this.mergeAndPrefix({

diff --git a/src/menus/menu-item.jsx b/src/menus/menu-item.jsx
@@ -57,7 +57,7 @@ let MenuItem = React.createClass({
       secondaryText,
       style,
       value,
-      ...other
+      ...other,
     } = this.props;
 
     let disabledColor = this.context.muiTheme.palette.disabledColor;

diff --git a/src/menus/menu.jsx b/src/menus/menu.jsx
@@ -104,7 +104,7 @@ let Menu = React.createClass({
       valueLink,
       width,
       zDepth,
-      ...other
+      ...other,
     } = this.props;
 
     let componentEntered = this.state.componentEntered;
@@ -221,7 +221,7 @@ let Menu = React.createClass({
 
     let {
       desktop,
-      selectedMenuItemStyle
+      selectedMenuItemStyle,
     } = this.props;
 
     let selected = this._isChildSelected(child);
@@ -233,7 +233,7 @@ let Menu = React.createClass({
 
     let mergedChildrenStyles = this.mergeStyles(
       child.props.style || {},
-      selectedChildrenStyles
+      selectedChildrenStyles,
     );
 
     let isFocused = childIndex === this.state.focusIndex;
@@ -268,7 +268,7 @@ let Menu = React.createClass({
     let {
       children,
       desktop,
-      maxHeight
+      maxHeight,
     } = this.props;
     let count = 1;
     let currentHeight = desktop ? 16 : 8;
@@ -304,7 +304,7 @@ let Menu = React.createClass({
 
   _getSelectedIndex() {
     let {
-      children
+      children,
     } = this.props;
     let selectedIndex = -1;
     let menuItemIndex = 0;

diff --git a/src/overlay.jsx b/src/overlay.jsx
@@ -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);

diff --git a/src/radio-button-group.jsx b/src/radio-button-group.jsx
@@ -47,7 +47,7 @@ let RadioButtonGroup = React.createClass({
         value,
         label,
         onCheck,
-        ...other
+        ...other,
       } = option.props;
 
       return <RadioButton

diff --git a/src/radio-button.jsx b/src/radio-button.jsx
@@ -70,7 +70,7 @@ let RadioButton = React.createClass({
   render() {
     let {
       onCheck,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();

diff --git a/src/ripples/circle-ripple.jsx b/src/ripples/circle-ripple.jsx
@@ -27,7 +27,7 @@ let CircleRipple = React.createClass({
       started,
       ending,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.mergeAndPrefix({

diff --git a/src/select-field.jsx b/src/select-field.jsx
@@ -104,7 +104,7 @@ let SelectField = React.createClass({
       floatingLabelText,
       hintText,
       fullWidth,
-      ...other
+      ...other,
     } = this.props;
 
     let textFieldProps = {