From 293c2e632cac91f203e6f3ccb5d72da7f6efbf38 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Tue, 8 Mar 2016 16:28:11 -0500 Subject: [PATCH 1/4] remove unnecessary left and width from chapters button menu --- src/css/components/_chapters.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/css/components/_chapters.scss b/src/css/components/_chapters.scss index b70b018ee0..91695452f5 100644 --- a/src/css/components/_chapters.scss +++ b/src/css/components/_chapters.scss @@ -2,11 +2,6 @@ @extend .vjs-icon-chapters; } -.vjs-chapters-button .vjs-menu { - left: -10em; // (Width of vjs-menu - width of vjs-control) / 2 - width: 0; -} - .vjs-chapters-button .vjs-menu ul { width: 24em; } From da3d6867a0edc561a1ed6f53c73f240602715748 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Tue, 8 Mar 2016 16:38:55 -0500 Subject: [PATCH 2/4] Make sure that the chapters title is first --- src/js/control-bar/text-track-controls/chapters-button.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/control-bar/text-track-controls/chapters-button.js b/src/js/control-bar/text-track-controls/chapters-button.js index 4ec5ecd39f..a885c751e1 100644 --- a/src/js/control-bar/text-track-controls/chapters-button.js +++ b/src/js/control-bar/text-track-controls/chapters-button.js @@ -90,11 +90,13 @@ class ChaptersButton extends TextTrackButton { let menu = this.menu; if (menu === undefined) { menu = new Menu(this.player_); - menu.contentEl().appendChild(Dom.createEl('li', { + let title = Dom.createEl('li', { className: 'vjs-menu-title', innerHTML: toTitleCase(this.kind_), tabIndex: -1 - })); + }); + menu.children_.unshift(title); + Dom.insertElFirst(title, menu.contentEl()); } if (chaptersTrack && chaptersTrack.cues == null) { From 267ffa771510ae5cb098db87779e3094acb4876c Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Wed, 9 Mar 2016 12:19:34 -0500 Subject: [PATCH 3/4] properly insert the title as the first element for menus --- src/js/menu/menu-button.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/menu/menu-button.js b/src/js/menu/menu-button.js index faa4a27a7e..7eed9b12e9 100644 --- a/src/js/menu/menu-button.js +++ b/src/js/menu/menu-button.js @@ -70,11 +70,13 @@ class MenuButton extends ClickableComponent { // Add a title list item to the top if (this.options_.title) { - menu.contentEl().appendChild(Dom.createEl('li', { + let title = Dom.createEl('li', { className: 'vjs-menu-title', innerHTML: toTitleCase(this.options_.title), tabIndex: -1 })); + menu.children_.unshift(title); + Dom.insertElFirst(title, menu.contentEl()); } this.items = this['createItems'](); From e34b17391c27a2a4b8e9d69b38511e7aef6a6541 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Wed, 9 Mar 2016 14:18:50 -0500 Subject: [PATCH 4/4] remove extra paren --- src/js/menu/menu-button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/menu/menu-button.js b/src/js/menu/menu-button.js index 7eed9b12e9..d5f69b2ead 100644 --- a/src/js/menu/menu-button.js +++ b/src/js/menu/menu-button.js @@ -74,7 +74,7 @@ class MenuButton extends ClickableComponent { className: 'vjs-menu-title', innerHTML: toTitleCase(this.options_.title), tabIndex: -1 - })); + }); menu.children_.unshift(title); Dom.insertElFirst(title, menu.contentEl()); }