Skip to content

Commit

Permalink
Merge pull request react-bootstrap#751 from AlexKVal/babelOAssign
Browse files Browse the repository at this point in the history
[changed] Remove extraneous utils/Object.assign.js
  • Loading branch information
mtscout6 committed May 29, 2015
2 parents 2be40a0 + 73c5ec9 commit 94a642c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 51 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"optional": [
"es7.objectRestSpread"
],
"plugins": [
"object-assign"
]
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"babel-core": "^5.1.10",
"babel-eslint": "^3.0.1",
"babel-loader": "^5.0.0",
"babel-plugin-object-assign": "^1.1.0",
"bootstrap": "^3.3.4",
"brfs": "^1.4.0",
"chai": "^2.2.0",
Expand Down
3 changes: 1 addition & 2 deletions src/Interpolate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import React from 'react';
import ValidComponentChildren from './utils/ValidComponentChildren';
import assign from './utils/Object.assign';

const REGEXP = /\%\((.+?)\)s/;

Expand All @@ -24,7 +23,7 @@ const Interpolate = React.createClass({
this.props.children : this.props.format;
let parent = this.props.component;
let unsafe = this.props.unsafe === true;
let props = assign({}, this.props);
let props = Object.assign({}, this.props);

delete props.children;
delete props.format;
Expand Down
3 changes: 1 addition & 2 deletions src/OverlayTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import RootCloseWrapper from './RootCloseWrapper';
import createChainedFunction from './utils/createChainedFunction';
import createContextWrapper from './utils/createContextWrapper';
import domUtils from './utils/domUtils';
import assign from './utils/Object.assign';

/**
* Check if value one is inside or equal to the of value
Expand Down Expand Up @@ -305,7 +304,7 @@ const OverlayTrigger = React.createClass({
const offset = container.tagName === 'BODY' ?
domUtils.getOffset(node) : domUtils.getPosition(node, container);

return assign({}, offset, {
return Object.assign({}, offset, {
height: node.offsetHeight,
width: node.offsetWidth
});
Expand Down
47 changes: 0 additions & 47 deletions src/utils/Object.assign.js

This file was deleted.

0 comments on commit 94a642c

Please sign in to comment.