From 91874a3f7ec28da72dc5380ba1b5ae7237567dcc Mon Sep 17 00:00:00 2001 From: Owen Edwards Date: Tue, 7 Feb 2017 12:59:35 -0800 Subject: [PATCH] fix: remove title attribute on menu items, fixes #3699 (#4009) --- src/css/video-js.scss | 2 +- src/js/clickable-component.js | 6 +++++- src/js/menu/menu-item.js | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/css/video-js.scss b/src/css/video-js.scss index 252a28a0fc..9181c6d8d5 100644 --- a/src/css/video-js.scss +++ b/src/css/video-js.scss @@ -2,7 +2,7 @@ @import "private-variables"; @import "utilities"; -@import "node_modules/videojs-font/scss/icons"; +@import "../../node_modules/videojs-font/scss/icons"; @import "components/layout"; @import "components/big-play"; diff --git a/src/js/clickable-component.js b/src/js/clickable-component.js index 0e03856674..a7149f82e0 100644 --- a/src/js/clickable-component.js +++ b/src/js/clickable-component.js @@ -121,7 +121,11 @@ class ClickableComponent extends Component { this.controlText_ = text; this.controlTextEl_.innerHTML = localizedText; - el.setAttribute('title', localizedText); + + if (!this.nonIconControl) { + // Set title attribute if only an icon is shown + el.setAttribute('title', localizedText); + } return this; } diff --git a/src/js/menu/menu-item.js b/src/js/menu/menu-item.js index 04c912ba85..282d658dab 100644 --- a/src/js/menu/menu-item.js +++ b/src/js/menu/menu-item.js @@ -54,6 +54,9 @@ class MenuItem extends ClickableComponent { * The element that gets created. */ createEl(type, props, attrs) { + // The control is textual, not just an icon + this.nonIconControl = true; + return super.createEl('li', assign({ className: 'vjs-menu-item', innerHTML: this.localize(this.options_.label),