File tree Expand file tree Collapse file tree 5 files changed +6
-51
lines changed Expand file tree Collapse file tree 5 files changed +6
-51
lines changed Original file line number Diff line number Diff line change 11{
22 "optional" : [
33 " es7.objectRestSpread"
4+ ],
5+ "plugins" : [
6+ " object-assign"
47 ]
58}
Original file line number Diff line number Diff line change 4545 "babel-core" : " ^5.1.10" ,
4646 "babel-eslint" : " ^3.0.1" ,
4747 "babel-loader" : " ^5.0.0" ,
48+ "babel-plugin-object-assign" : " ^1.1.0" ,
4849 "bootstrap" : " ^3.3.4" ,
4950 "brfs" : " ^1.4.0" ,
5051 "chai" : " ^2.2.0" ,
Original file line number Diff line number Diff line change 33
44import React from 'react' ;
55import ValidComponentChildren from './utils/ValidComponentChildren' ;
6- import assign from './utils/Object.assign' ;
76
87const REGEXP = / \% \( ( .+ ?) \) s / ;
98
@@ -24,7 +23,7 @@ const Interpolate = React.createClass({
2423 this . props . children : this . props . format ;
2524 let parent = this . props . component ;
2625 let unsafe = this . props . unsafe === true ;
27- let props = assign ( { } , this . props ) ;
26+ let props = Object . assign ( { } , this . props ) ;
2827
2928 delete props . children ;
3029 delete props . format ;
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ import RootCloseWrapper from './RootCloseWrapper';
66import createChainedFunction from './utils/createChainedFunction' ;
77import createContextWrapper from './utils/createContextWrapper' ;
88import domUtils from './utils/domUtils' ;
9- import assign from './utils/Object.assign' ;
109
1110/**
1211 * Check if value one is inside or equal to the of value
@@ -305,7 +304,7 @@ const OverlayTrigger = React.createClass({
305304 const offset = container . tagName === 'BODY' ?
306305 domUtils . getOffset ( node ) : domUtils . getPosition ( node , container ) ;
307306
308- return assign ( { } , offset , {
307+ return Object . assign ( { } , offset , {
309308 height : node . offsetHeight ,
310309 width : node . offsetWidth
311310 } ) ;
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments