web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-15 10:39:58 +02:00
Code Releases Activity

Switched lodash to use the compat version for IE8 support

Browse Source
This commit is contained in:
heff 2015-05-28 18:20:06 -07:00
parent 3bf01d9a41
commit 8d768ef0ab
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

2
src/js/utils/merge-options.js
View File

@ -1,4 +1,4 @@
import merge from 'lodash.merge';
import merge from 'lodash-compat/object/merge';
function isPlain(obj) {
return !!obj

2
src/js/video.js
View File

@ -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';