Skip to content

Commit

Permalink
Update build
Browse files Browse the repository at this point in the history
  • Loading branch information
norlin committed May 10, 2016
1 parent 87754a5 commit 4ea735c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
17 changes: 8 additions & 9 deletions dist/videojs-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,12 @@ vjs.registerComponent('SettingsButton', vjs.extend(MenuButton, {
var _this = this;
var opt = this.options_;
var menu = MenuButton.prototype.createMenu.call(this);
if (opt.show_settings_popup_on_click)
{
menu.addClass('vjs-menu-popup-on-click');
// videojs removes the locking state on menu item click that causes
// settings button to hide without updating buttonPressed state
menu.children().forEach(function(component){
component.on('click', function(){ _this.handleClick(); });
});
}
menu.addClass('vjs-menu-popup-on-click');
// videojs removes the locking state on menu item click that causes
// settings button to hide without updating buttonPressed state
menu.children().forEach(function(component){
component.on('click', function(){ _this.handleClick(); });
});
return menu;
},
handleClick: function(){
Expand Down Expand Up @@ -400,6 +397,8 @@ var QualityButton = vjs.getComponent('QualityButton');

vjs.plugin('settings', function(opt){
var video = this;
if (opt===undefined||opt===true)
opt = {info: true, report: true, quality: true};
opt = vjs.mergeOptions({}, opt);
video.on('ready', function(){
function local_storage_set(key, value){
Expand Down
2 changes: 1 addition & 1 deletion dist/videojs-settings.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "videojs-settings",
"version": "0.0.1-12",
"version": "0.0.1-13",
"description": "A settings button for Video.js",
"main": "videojs-settings.js",
"scripts": {
Expand Down

0 comments on commit 4ea735c

Please sign in to comment.