Skip to content

Commit

Permalink
Fixed the VolumeMenuButton options to allow passing 'vertical&#x…
Browse files Browse the repository at this point in the history
…27; to the VolumeBar. closes #1631
  • Loading branch information
heff committed Oct 30, 2014
1 parent 1325722 commit 5d859a9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CHANGELOG
=========

## HEAD (Unreleased)
* @heff fixed checking for child options in the parent options to allow for 'false'; ([view](https://github.com/videojs/video.js/pull/1630))
* @heff fixed checking for child options in the parent options to allow for 'false' ([view](https://github.com/videojs/video.js/pull/1630))
* @heff fixed the VolumeMenuButton options to allow passing 'vertical' to the VolumeBar ([view](https://github.com/videojs/video.js/pull/1631))

--------------------

Expand Down
2 changes: 1 addition & 1 deletion src/js/control-bar/volume-menu-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ vjs.VolumeMenuButton.prototype.createMenu = function(){
var menu = new vjs.Menu(this.player_, {
contentElType: 'div'
});
var vc = new vjs.VolumeBar(this.player_, this.options_.volumeBar);
var vc = new vjs.VolumeBar(this.player_, this.options_['volumeBar']);
vc.on('focus', function() {
menu.lockShowing();
});
Expand Down

0 comments on commit 5d859a9

Please sign in to comment.