web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-04 06:48:49 +02:00
Code Releases Activity

test(hooks): fix hooks unit test in ie8 (#3745)

Browse Source
This commit is contained in:
Brandon Casey 2016-11-04 16:43:27 -04:00 committed by Gary Katsevman
parent 8d51235b30
commit e9e5b5f782
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/video.js
View File

@ -107,14 +107,14 @@ function videojs(id, options, ready) {
}
videojs.hooks('beforesetup').forEach(function(hookFunction) {
const opts = hookFunction(tag, videojs.mergeOptions({}, options));
const opts = hookFunction(tag, mergeOptions(options));
if (!opts || typeof opts !== 'object' || Array.isArray(opts)) {
videojs.log.error('please return an object in beforesetup hooks');
return;
}
options = videojs.mergeOptions(options, opts);
options = mergeOptions(options, opts);
});
// If not, set up a new player

2
test/unit/video.test.js
View File

@ -336,7 +336,7 @@ QUnit.test('beforesetup options override videojs options', function(assert) {
const vid = document.getElementById('test_vid_id');
videojs.hook('beforesetup', function(options) {
videojs.hook('beforesetup', function(tag, options) {
assert.equal(options.autoplay, false, 'false was passed to us');
return {autoplay: true};
});