From 3521cde1ad27992024e130f4673218c2b7cd2fad Mon Sep 17 00:00:00 2001
From: Zadielerick <zadielerick@gmail.com>
Date: Fri, 10 Jul 2015 14:55:57 -0500
Subject: [PATCH 1/2] Fixed PR that did not incorporate errorStyles prop

---
 src/text-field.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/text-field.jsx b/src/text-field.jsx
index 557c655e79e004..ccda69822ab618 100644
--- a/src/text-field.jsx
+++ b/src/text-field.jsx
@@ -236,7 +236,7 @@ let TextField = React.createClass({
     let inputId = id || this._uniqueId;
 
     let errorTextElement = this.state.errorText ? (
-      <div style={this.mergeAndPrefix(styles.error)}>{this.state.errorText}</div>
+      <div style={this.mergeAndPrefix(styles.error, errorStyle)}>{this.state.errorText}</div>
     ) : null;
 
     let hintTextElement = hintText ? (

From 838abb4728614e184438002021bf1d539d104501 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Fri, 10 Jul 2015 21:15:35 +0100
Subject: [PATCH 2/2] [eslint] fix comma-dangle after release of eslint 0.24.0

---
 src/avatar.jsx                           |  2 +-
 src/before-after-wrapper.jsx             | 14 +++++++++-----
 src/card/card.jsx                        |  2 +-
 src/checkbox.jsx                         |  2 +-
 src/circular-progress.jsx                |  2 +-
 src/clearfix.jsx                         |  2 +-
 src/date-picker/date-display.jsx         |  2 +-
 src/date-picker/date-picker-dialog.jsx   |  2 +-
 src/date-picker/date-picker.jsx          |  2 +-
 src/date-picker/day-button.jsx           |  2 +-
 src/date-picker/year-button.jsx          |  2 +-
 src/drop-down-icon.jsx                   |  2 +-
 src/enhanced-button.jsx                  |  2 +-
 src/enhanced-switch.jsx                  |  6 +++---
 src/enhanced-textarea.jsx                |  2 +-
 src/flat-button.jsx                      |  2 +-
 src/font-icon.jsx                        |  2 +-
 src/icon-button.jsx                      |  5 +++--
 src/linear-progress.jsx                  |  2 +-
 src/lists/list-divider.jsx               |  2 +-
 src/lists/list-item.jsx                  |  2 +-
 src/lists/list.jsx                       |  2 +-
 src/menu/menu-item.jsx                   |  2 +-
 src/menu/menu.jsx                        |  6 +++---
 src/menus/icon-menu.jsx                  |  2 +-
 src/menus/menu-divider.jsx               |  2 +-
 src/menus/menu-item.jsx                  |  2 +-
 src/menus/menu.jsx                       | 10 +++++-----
 src/overlay.jsx                          |  2 +-
 src/radio-button-group.jsx               |  2 +-
 src/radio-button.jsx                     |  2 +-
 src/ripples/circle-ripple.jsx            |  2 +-
 src/select-field.jsx                     |  2 +-
 src/svg-icon.jsx                         |  2 +-
 src/table/table-footer.jsx               |  2 +-
 src/table/table-header.jsx               |  2 +-
 src/table/table-row.jsx                  |  2 +-
 src/text-field.jsx                       |  2 +-
 src/time-picker/time-display.jsx         |  2 +-
 src/time-picker/time-picker.jsx          |  2 +-
 src/toggle.jsx                           |  2 +-
 src/toolbar/toolbar-title.jsx            |  2 +-
 src/transition-groups/slide-in-child.jsx |  6 +++---
 src/transition-groups/slide-in.jsx       |  2 +-
 44 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/src/avatar.jsx b/src/avatar.jsx
index c76559c76ab03e..b204dac6b93728 100644
--- 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
index f9439042eac3a5..643bcfe5dddd5e 100644
--- 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
index 6ea77315f08114..6b61e2357974fd 100644
--- 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
index 48b039f70d712c..f7b811c5e27c32 100644
--- 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
index cc6251e8deb567..2144805d39cca2 100644
--- a/src/circular-progress.jsx
+++ b/src/circular-progress.jsx
@@ -148,7 +148,7 @@ let CircularProgress = React.createClass({
       style,
       innerStyle,
       size,
-      ...other
+      ...other,
     } = this.props;
 
 
diff --git a/src/clearfix.jsx b/src/clearfix.jsx
index 874e491ff82308..48ace8afc516e8 100644
--- 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
index c32288a6831d43..a0e74b6555f5f4 100644
--- 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
index 8e503e46c25fbe..89dafde0f763b6 100644
--- 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
index e59b012990db7d..190b6f78a7619e 100644
--- 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
index a141864dd8e67d..4bcc2c7c6886c4 100644
--- 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
index a826e3476348b9..893dad72c6010d 100644
--- 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
index 16dae1f3a7b0c8..29e2af6cd3c4bf 100644
--- 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
index f0dfe5664adeb3..bae2d44dd15bad 100644
--- 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
index 8d818a0c850eff..e8190d3e6f06b4 100644
--- 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
index b8cc297ccb2899..36e2e43bbcf3af 100644
--- 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
index b8fe1e80e098e0..f0253aade62442 100644
--- 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
index eb9c17af30e622..1375839c24a2d1 100644
--- 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
index c05fc1c966d3ec..43509d4470d5aa 100644
--- 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
index 4805530cb3a724..ababaa8236865b 100644
--- 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
index 281089b772c55e..f4cd8a90b7f3fa 100644
--- 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
index 01f0765ae6deb5..60abb1d5d10a02 100644
--- 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
index fc23223064790e..8671b1586d6ee1 100644
--- 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
index b14efe02908348..b358aa8ca8378e 100644
--- 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
index 213ad1cefdaa81..3148d5e7e5300d 100644
--- 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
index 832ed149bd4657..a81fb0580c759f 100644
--- 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
index 438c6a1f7c4e99..d373f593302547 100644
--- 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
index d83b05c89b56a7..538d81c5fcc0ff 100644
--- 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
index 1d7383cca7857f..36b0c1b400fa10 100644
--- 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
index 2d93a9c4a3ae5b..156988fbacaf53 100644
--- 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
index 9c1a2a86cb2abb..9f41e1b02f0f10 100644
--- 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
index 0a5e9bc6abbf46..364a59f144f2ae 100644
--- 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
index a1d3a7365e5336..f9871ce9422f20 100644
--- 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
index e1d6592f954bce..d4105bbad02153 100644
--- 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 = {
diff --git a/src/svg-icon.jsx b/src/svg-icon.jsx
index d9bb46e5d0e2ae..9955822a9e2470 100644
--- a/src/svg-icon.jsx
+++ b/src/svg-icon.jsx
@@ -37,7 +37,7 @@ let SvgIcon = React.createClass({
       hoverColor,
       viewBox,
       style,
-      ...other
+      ...other,
     } = this.props;
 
     let offColor = color ? color :
diff --git a/src/table/table-footer.jsx b/src/table/table-footer.jsx
index 3a12cff49af210..c97ff75590fcc6 100644
--- a/src/table/table-footer.jsx
+++ b/src/table/table-footer.jsx
@@ -62,7 +62,7 @@ let TableFooter = React.createClass({
     for (let index = 0; index < footerData.length; index++) {
       let {
         content,
-        ...props
+        ...props,
       } = footerData[index];
       if (content === undefined) content = footerData[index];
       let key = keyPrefix + index;
diff --git a/src/table/table-header.jsx b/src/table/table-header.jsx
index bd7cc59b3b7ca8..3aa26d6285b9d0 100644
--- a/src/table/table-header.jsx
+++ b/src/table/table-header.jsx
@@ -93,7 +93,7 @@ let TableHeader = React.createClass({
         content,
         tooltip,
         style,
-        ...props
+        ...props,
       } = headerData[index];
       let key = keyPrefix + index;
 
diff --git a/src/table/table-row.jsx b/src/table/table-row.jsx
index d586a724577df1..b7eb7efe2b9b6b 100644
--- a/src/table/table-row.jsx
+++ b/src/table/table-row.jsx
@@ -102,7 +102,7 @@ let TableRow = React.createClass({
       let key = this.props.rowNumber + '-' + index;
       let {
         content,
-        style
+        style,
       } = columns[index];
       if (content === undefined) content = columns[index];
 
diff --git a/src/text-field.jsx b/src/text-field.jsx
index 557c655e79e004..6d89fb78ed2e19 100644
--- a/src/text-field.jsx
+++ b/src/text-field.jsx
@@ -228,7 +228,7 @@ let TextField = React.createClass({
       onFocus,
       type,
       rows,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();
diff --git a/src/time-picker/time-display.jsx b/src/time-picker/time-display.jsx
index 54bb852535fb53..b020ed7cc99921 100644
--- a/src/time-picker/time-display.jsx
+++ b/src/time-picker/time-display.jsx
@@ -66,7 +66,7 @@ let TimeDisplay = React.createClass({
     let {
       selectedTime,
       mode,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = {
diff --git a/src/time-picker/time-picker.jsx b/src/time-picker/time-picker.jsx
index 36eb468a88273d..c0244677d81487 100644
--- a/src/time-picker/time-picker.jsx
+++ b/src/time-picker/time-picker.jsx
@@ -70,7 +70,7 @@ let TimePicker = React.createClass({
       onTouchTap,
       onShow,
       onDismiss,
-      ...other
+      ...other,
     } = this.props;
 
     let defaultInputValue;
diff --git a/src/toggle.jsx b/src/toggle.jsx
index 63f3f22edf3dfa..dc6df24f94195b 100644
--- a/src/toggle.jsx
+++ b/src/toggle.jsx
@@ -88,7 +88,7 @@ let Toggle = React.createClass({
   render() {
     let {
       onToggle,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.getStyles();
diff --git a/src/toolbar/toolbar-title.jsx b/src/toolbar/toolbar-title.jsx
index a7d8e5ba05f0ca..a4b1ae70b684c3 100644
--- a/src/toolbar/toolbar-title.jsx
+++ b/src/toolbar/toolbar-title.jsx
@@ -22,7 +22,7 @@ let ToolbarTitle = React.createClass({
     let {
       style,
       text,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.mergeAndPrefix({
diff --git a/src/transition-groups/slide-in-child.jsx b/src/transition-groups/slide-in-child.jsx
index bf9dec48876d1a..85176cf1a38045 100644
--- a/src/transition-groups/slide-in-child.jsx
+++ b/src/transition-groups/slide-in-child.jsx
@@ -50,15 +50,15 @@ let SlideInChild = React.createClass({
   render() {
     let {
       styles,
-      ...other
+      ...other,
     } = this.props;
 
     styles = this.mergeAndPrefix({
       position: 'absolute',
       height: '100%',
       width: '100%',
-      top: '0px',
-      left: '0px',
+      top: 0,
+      left: 0,
       transition: Transitions.easeOut(),
     }, this.props.style);
 
diff --git a/src/transition-groups/slide-in.jsx b/src/transition-groups/slide-in.jsx
index d2227b432460d1..59af4a9e375d4f 100644
--- a/src/transition-groups/slide-in.jsx
+++ b/src/transition-groups/slide-in.jsx
@@ -21,7 +21,7 @@ let SlideIn = React.createClass({
   render() {
     let {
       direction,
-      ...other
+      ...other,
     } = this.props;
 
     let styles = this.mergeAndPrefix({