Skip to content

Commit 73c5ec9

Browse files
committed
[changed] Remove extraneous utils/Object.assign.js
1 parent 1b98730 commit 73c5ec9

File tree

5 files changed

+6
-51
lines changed

5 files changed

+6
-51
lines changed

.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"optional": [
33
"es7.objectRestSpread"
4+
],
5+
"plugins": [
6+
"object-assign"
47
]
58
}

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
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",

src/Interpolate.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import React from 'react';
55
import ValidComponentChildren from './utils/ValidComponentChildren';
6-
import assign from './utils/Object.assign';
76

87
const 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;

src/OverlayTrigger.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import RootCloseWrapper from './RootCloseWrapper';
66
import createChainedFunction from './utils/createChainedFunction';
77
import createContextWrapper from './utils/createContextWrapper';
88
import 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
});

src/utils/Object.assign.js

-47
This file was deleted.

0 commit comments

Comments
 (0)