From 8d768ef0ab6c3b2fb9f3148eccb2406337020384 Mon Sep 17 00:00:00 2001 From: heff Date: Thu, 28 May 2015 18:20:06 -0700 Subject: [PATCH] Switched lodash to use the compat version for IE8 support --- package.json | 2 +- src/js/utils/merge-options.js | 2 +- src/js/video.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 457ee62ee..dc3d0a462 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "style": "./dist/video-js.css", "dependencies": { "global": "^4.3.0", - "lodash.merge": "^3.2.1", + "lodash-compat": "^3.9.3", "object.assign": "^2.0.1", "safe-json-parse": "^4.0.0", "videojs-swf": "4.7.0", diff --git a/src/js/utils/merge-options.js b/src/js/utils/merge-options.js index 82e034b7f..34b517bd0 100644 --- a/src/js/utils/merge-options.js +++ b/src/js/utils/merge-options.js @@ -1,4 +1,4 @@ -import merge from 'lodash.merge'; +import merge from 'lodash-compat/object/merge'; function isPlain(obj) { return !!obj diff --git a/src/js/video.js b/src/js/video.js index ced7edebe..adddc01e4 100644 --- a/src/js/video.js +++ b/src/js/video.js @@ -11,7 +11,7 @@ import log from './utils/log.js'; import * as Dom from './utils/dom.js'; import * as browser from './utils/browser.js'; import extendsFn from './extends.js'; -import merge from 'lodash.merge'; +import merge from 'lodash-compat/object/merge'; // Include the built-in techs import Html5 from './tech/html5.js';