web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Code Releases Activity

fix: addChild with index should allow for children that are elements (#6672)

Browse Source 
This is #6644 but against the 7.7.x release line.

Co-authored-by: mister-ben <git@misterben.me>
This commit is contained in:
Gary Katsevman 2020-05-26 17:27:55 -04:00 committed by GitHub
parent 4a82283b97
commit 2afeb15229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/component.js
View File

@ -495,8 +495,13 @@ class Component {
// If inserting before a component, insert before that component's element // If inserting before a component, insert before that component's element
let refNode = null; let refNode = null;
if (this.children_[index + 1] && this.children_[index + 1].el_) { if (this.children_[index + 1]) {
// Most children are components, but the video tech is an HTML element
if (this.children_[index + 1].el_) {
refNode = this.children_[index + 1].el_; refNode = this.children_[index + 1].el_;
} else if (Dom.isEl(this.children_[index + 1])) {
refNode = this.children_[index + 1];
}
} }
this.contentEl().insertBefore(component.el(), refNode); this.contentEl().insertBefore(component.el(), refNode);

20
test/unit/component.test.js
View File

@ -164,6 +164,26 @@ QUnit.test('should insert element relative to the element of the component to in
/* eslint-enable no-unused-vars */ /* eslint-enable no-unused-vars */
}); });
QUnit.test('should allow for children that are elements', function(assert) {
// for legibility of the test itself:
/* eslint-disable no-unused-vars */
const comp = new Component(getFakePlayer());
const testEl = Dom.createEl('div');
// Add element as video el gets added to player
comp.el().appendChild(testEl);
comp.children_.unshift(testEl);
const child1 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c1'})});
const child2 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c4'})}, 0);
assert.ok(child2.el_.nextSibling === testEl, 'addChild should insert el before a sibling that is an element');
/* eslint-enable no-unused-vars */
});
QUnit.test('addChild should throw if the child does not exist', function(assert) { QUnit.test('addChild should throw if the child does not exist', function(assert) {
const comp = new Component(getFakePlayer()); const comp = new Component(getFakePlayer());