From 757c592b4aa43e0a072eddfc430cc480f7593bae Mon Sep 17 00:00:00 2001
From: Ryan Plessner <ryan.plessner@cantinaconsulting.com>
Date: Tue, 23 Sep 2014 15:26:09 -0400
Subject: [PATCH] reverted the submenu behavior. it now needs to activated
 before it menuitems become tab targets. The volume control bar now uses the
 vjs-lock-showing class instead of new class.

---
 src/css/video-js.less                    | 10 +++++++++-
 src/js/control-bar/volume-menu-button.js |  4 ++--
 src/js/menu.js                           |  8 --------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/css/video-js.less b/src/css/video-js.less
index 5c349ac70..eb42aae5e 100644
--- a/src/css/video-js.less
+++ b/src/css/video-js.less
@@ -733,6 +733,11 @@ easily in the skin designer. http://designer.videojs.com/
   border-top-color: rgba(7, 40, 50, 0.5); /* Same as ul background */
 }
 
+.vjs-default-skin .vjs-control-content .vjs-menu {
+  z-index: 0;
+  display: none;
+}
+
 /* Button Pop-up Menu */
 .vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content {
   display: block;
@@ -750,9 +755,12 @@ easily in the skin designer. http://designer.videojs.com/
 }
 
 .vjs-default-skin .vjs-menu-button:hover .vjs-menu,
-.vjs-default-skin .vjs-menu-button .vjs-visible-menu {
+.vjs-default-skin .vjs-menu-button .vjs-menu.vjs-lock-showing {
   z-index: 1;
 }
+.vjs-default-skin .vjs-control-content .vjs-menu.vjs-lock-showing {
+  display: block;
+}
 .vjs-default-skin .vjs-menu-button ul li {
   list-style: none;
   margin: 0;
diff --git a/src/js/control-bar/volume-menu-button.js b/src/js/control-bar/volume-menu-button.js
index f50eb5b11..52797e454 100644
--- a/src/js/control-bar/volume-menu-button.js
+++ b/src/js/control-bar/volume-menu-button.js
@@ -31,10 +31,10 @@ vjs.VolumeMenuButton.prototype.createMenu = function(){
   });
   var vc = new vjs.VolumeBar(this.player_, vjs.obj.merge({'vertical': true}, this.options_.volumeBar));
   vc.on('focus', function() {
-    menu.addClass('vjs-visible-menu');
+    menu.lockShowing();
   });
   vc.on('blur', function() {
-    menu.removeClass('vjs-visible-menu');
+    menu.unlockShowing();
   });
   menu.addChild(vc);
   return menu;
diff --git a/src/js/menu.js b/src/js/menu.js
index a1b73b402..4745debe4 100644
--- a/src/js/menu.js
+++ b/src/js/menu.js
@@ -139,17 +139,9 @@ vjs.MenuButton.prototype.createMenu = function(){
   this.items = this['createItems']();
 
   if (this.items) {
-    var focusHandler = function(){
-      menu.addClass('vjs-visible-menu');
-    };
-    var blurHandler = function() {
-      menu.removeClass('vjs-visible-menu');
-    };
     // Add menu items to the menu
     for (var i = 0; i < this.items.length; i++) {
       menu.addItem(this.items[i]);
-      this.items[i].on('focus', focusHandler);
-      this.items[i].on('blur', blurHandler);
     }
   }