Skip to content

Commit

Permalink
Merge pull request react-bootstrap#1341 from dmatteo/lodash-compat
Browse files Browse the repository at this point in the history
[changed] use `lodash-compat` in src/ for IE8 compatibility
  • Loading branch information
taion committed Sep 22, 2015
2 parents b201497 + 99d333f commit 98ff359
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/src/PropTable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from 'lodash/object/merge';
import merge from 'lodash-compat/object/merge';
import React from 'react';
import Glyphicon from '../../src/Glyphicon';
import Label from '../../src/Label';
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"karma-webpack": "^1.7.0",
"less": "^2.5.1",
"less-loader": "^2.2.0",
"lodash": "^3.10.1",
"marked": "^0.3.5",
"mocha": "^2.2.5",
"mt-changelog": "^0.6.1",
Expand Down Expand Up @@ -113,7 +114,7 @@
"classnames": "^2.1.3",
"dom-helpers": "^2.2.4",
"keycode": "^2.0.0",
"lodash": "^3.10.0",
"lodash-compat": "^3.10.1",
"react-overlays": "^0.4.4",
"uncontrollable": "^3.1.1"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import DropdownMenu from './DropdownMenu';
import CustomPropTypes from './utils/CustomPropTypes';
import ValidComponentChildren from './utils/ValidComponentChildren';
import createChainedFunction from './utils/createChainedFunction';
import find from 'lodash/collection/find';
import omit from 'lodash/object/omit';
import find from 'lodash-compat/collection/find';
import omit from 'lodash-compat/object/omit';

import activeElement from 'dom-helpers/activeElement';
import contains from 'dom-helpers/query/contains';
Expand Down
2 changes: 1 addition & 1 deletion src/DropdownButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Dropdown from './Dropdown';
import NavDropdown from './NavDropdown';
import CustomPropTypes from './utils/CustomPropTypes';
import deprecationWarning from './utils/deprecationWarning';
import omit from 'lodash/object/omit';
import omit from 'lodash-compat/object/omit';

class DropdownButton extends React.Component {

Expand Down
2 changes: 1 addition & 1 deletion src/OverlayTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import createChainedFunction from './utils/createChainedFunction';
import createContextWrapper from './utils/createContextWrapper';
import Overlay from './Overlay';
import warning from 'react/lib/warning';
import pick from 'lodash/object/pick';
import pick from 'lodash-compat/object/pick';
/**
* Check if value one is inside or equal to the of value
*
Expand Down

0 comments on commit 98ff359

Please sign in to comment.