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

fix: ensure components added with an index are added in the correct location (#6297)

Browse Source
This commit is contained in:
mister-ben 2019-11-14 21:22:42 +01:00 committed by Gary Katsevman
parent a615236cfb
commit f7b3772e27
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/component.js
View File

@ -492,8 +492,12 @@ class Component {
// Add the UI object's element to the container div (box) // Add the UI object's element to the container div (box)
// Having an element is not required // Having an element is not required
if (typeof component.el === 'function' && component.el()) { if (typeof component.el === 'function' && component.el()) {
const childNodes = this.contentEl().children; // If inserting before a component, insert before that component's element
const refNode = childNodes[index] || null; let refNode = null;
if (this.children_[index + 1] && this.children_[index + 1].el_) {
refNode = this.children_[index + 1].el_;
}
this.contentEl().insertBefore(component.el(), refNode); this.contentEl().insertBefore(component.el(), refNode);
} }

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

@ -146,6 +146,24 @@ QUnit.test('should add a child component to an index', function(assert) {
comp.dispose(); comp.dispose();
}); });
QUnit.test('should insert element relative to the element of the component to insert before', function(assert) {
// for legibility of the test itself:
/* eslint-disable no-unused-vars */
const comp = new Component(getFakePlayer());
const child0 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c0'})});
const child1 = comp.addChild('component', {createEl: false});
const child2 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c2'})});
const child3 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c3'})});
const child4 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c4'})}, comp.children_.indexOf(child2));
assert.ok(child2.el_.previousSibling === child4.el_, 'addChild should insert el before its next sibling\'s 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());