From 99d333f1c48ab96026c089420cb17ea0ba7d4f28 Mon Sep 17 00:00:00 2001 From: Domenico Matteo Date: Sun, 20 Sep 2015 21:56:10 +0200 Subject: [PATCH] [changed] use `lodash-compat` for IE8 compatibility and `lodash` for dev --- docs/src/PropTable.js | 2 +- package.json | 3 ++- src/Dropdown.js | 4 ++-- src/DropdownButton.js | 2 +- src/OverlayTrigger.js | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/src/PropTable.js b/docs/src/PropTable.js index 59d11436c6..0ab6b57743 100644 --- a/docs/src/PropTable.js +++ b/docs/src/PropTable.js @@ -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'; diff --git a/package.json b/package.json index d84ddd234b..28ae390ecf 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" }, diff --git a/src/Dropdown.js b/src/Dropdown.js index 9a816bf404..9152384428 100644 --- a/src/Dropdown.js +++ b/src/Dropdown.js @@ -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'; diff --git a/src/DropdownButton.js b/src/DropdownButton.js index 1ab4a16b19..9e12bd5c01 100644 --- a/src/DropdownButton.js +++ b/src/DropdownButton.js @@ -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 { diff --git a/src/OverlayTrigger.js b/src/OverlayTrigger.js index 43eed2e765..9eda17e390 100644 --- a/src/OverlayTrigger.js +++ b/src/OverlayTrigger.js @@ -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 *