web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-04-11 11:42:08 +02:00
Code Releases Activity

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.

Browse Source
This commit is contained in:
Ryan Plessner 2014-09-23 15:26:09 -04:00
parent 53d690c212
commit 757c592b4a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/css/video-js.less
View File

@ -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;

4
src/js/control-bar/volume-menu-button.js
View File

@ -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;

8
src/js/menu.js
View File

@ -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);
}
}