File tree 5 files changed +6
-51
lines changed
5 files changed +6
-51
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"optional" : [
3
3
" es7.objectRestSpread"
4
+ ],
5
+ "plugins" : [
6
+ " object-assign"
4
7
]
5
8
}
Original file line number Diff line number Diff line change 45
45
"babel-core" : " ^5.1.10" ,
46
46
"babel-eslint" : " ^3.0.1" ,
47
47
"babel-loader" : " ^5.0.0" ,
48
+ "babel-plugin-object-assign" : " ^1.1.0" ,
48
49
"bootstrap" : " ^3.3.4" ,
49
50
"brfs" : " ^1.4.0" ,
50
51
"chai" : " ^2.2.0" ,
Original file line number Diff line number Diff line change 3
3
4
4
import React from 'react' ;
5
5
import ValidComponentChildren from './utils/ValidComponentChildren' ;
6
- import assign from './utils/Object.assign' ;
7
6
8
7
const REGEXP = / \% \( ( .+ ?) \) s / ;
9
8
@@ -24,7 +23,7 @@ const Interpolate = React.createClass({
24
23
this . props . children : this . props . format ;
25
24
let parent = this . props . component ;
26
25
let unsafe = this . props . unsafe === true ;
27
- let props = assign ( { } , this . props ) ;
26
+ let props = Object . assign ( { } , this . props ) ;
28
27
29
28
delete props . children ;
30
29
delete props . format ;
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ import RootCloseWrapper from './RootCloseWrapper';
6
6
import createChainedFunction from './utils/createChainedFunction' ;
7
7
import createContextWrapper from './utils/createContextWrapper' ;
8
8
import domUtils from './utils/domUtils' ;
9
- import assign from './utils/Object.assign' ;
10
9
11
10
/**
12
11
* Check if value one is inside or equal to the of value
@@ -305,7 +304,7 @@ const OverlayTrigger = React.createClass({
305
304
const offset = container . tagName === 'BODY' ?
306
305
domUtils . getOffset ( node ) : domUtils . getPosition ( node , container ) ;
307
306
308
- return assign ( { } , offset , {
307
+ return Object . assign ( { } , offset , {
309
308
height : node . offsetHeight ,
310
309
width : node . offsetWidth
311
310
} ) ;
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments