Skip to content

Commit 47cbc19

Browse files
committed
Using React's object.assign method to be ES5 compatible which was the intent. (marnusw#2)
1 parent 28aadfb commit 47cbc19

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### v0.1.4 (9 September 2015)
2+
3+
* [BUGFIX] Using React's `object.assign` method to be ES5 compatible which was the intent. (#2)
4+
15
### v0.1.3 (12 August 2015)
26

37
* [BUGFIX] Added the `classnames` dependency to `package.json`. (#1)

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"react": ">=0.13.0"
2121
},
2222
"devDependencies": {
23-
"babel": "^5.8.21",
24-
"babel-eslint": "^4.0.5",
25-
"eslint": "^1.1.0",
26-
"eslint-plugin-react": "^3.2.1",
23+
"babel": "^5.8.23",
24+
"babel-eslint": "^4.1.1",
25+
"eslint": "^1.3.1",
26+
"eslint-plugin-react": "^3.3.1",
2727
"gulp": "^3.9.0",
2828
"gulp-eslint": "^1.0.0"
2929
},

src/ReactCSSTransitionReplace.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import React from 'react/addons';
88
import classSet from 'classnames';
9+
import assign from 'react/lib/Object.assign';
910

1011
import ReplaceChildComponent from './ReactCSSTransitionReplaceChild';
1112

@@ -117,7 +118,7 @@ class ReactCSSTransitionReplace extends React.Component {
117118

118119
heightClassName = `${this.props.transitionName}-height`;
119120

120-
style = Object.assign(style || {}, {
121+
style = assign(style || {}, {
121122
overflow: this.state.height !== 'auto' ? 'hidden' : 'visible',
122123
height: this.state.height,
123124
display: 'block'

0 commit comments

Comments
 (0)