Merge branch 'feature/fix-menu-title' of github.com:coursera/video.js…

… into coursera-feature/fix-menu-title
videojs · Apr 18, 2014 · 4660573 · ange007 · Apr 19, 2014 · 4660573
2 parents 3bafdee + 9d25874
commit 4660573
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 * The UI now resets after a source change ([view](https://github.com/videojs/video.js/pull/1124))
 * Now assuming smart CSS defaults for sliders to prevent reflow on player init ([view](https://github.com/videojs/video.js/pull/1122))
 * Fixed the title element placement in menus [[view](https://github.com/videojs/video.js/pull/1114)]
+* Fixed title support for menu buttons ([view](https
 
 --------------------
 

diff --git a/src/js/menu.js b/src/js/menu.js
@@ -131,7 +131,7 @@ vjs.MenuButton.prototype.createMenu = function(){
   if (this.options().title) {
     menu.contentEl().appendChild(vjs.createEl('li', {
       className: 'vjs-menu-title',
-      innerHTML: vjs.capitalize(this.kind_),
+      innerHTML: vjs.capitalize(this.options().title),
       tabindex: -1
     }));
   }

diff --git a/test/unit/menu.js b/test/unit/menu.js
@@ -5,10 +5,8 @@ test('should place title list item into ul', function() {
 
   player = PlayerTest.makePlayer();
 
-  vjs.MenuButton.prototype.kind_ = 'testTitle';
-
   menuButton = new vjs.MenuButton(player, {
-    'title': true
+    'title': 'testTitle'
   });
 
   var menuContentElement = menuButton.el().getElementsByTagName('UL')[0];