diff --git a/src/css/video-js.less b/src/css/video-js.less index 577db7dfad..12638bb596 100644 --- a/src/css/video-js.less +++ b/src/css/video-js.less @@ -777,6 +777,10 @@ easily in the skin designer. http://designer.videojs.com/ .vjs-default-skin .vjs-control-content .vjs-menu.vjs-lock-showing { display: block; } +/* prevent menus from opening while scrubbing (FF, IE) */ +.vjs-default-skin.vjs-scrubbing .vjs-menu-button:hover .vjs-control-content .vjs-menu { + display: none; +} .vjs-default-skin .vjs-menu-button ul li { list-style: none; margin: 0; diff --git a/src/js/control-bar/progress-control.js b/src/js/control-bar/progress-control.js index 360d60e76d..8494fda8e4 100644 --- a/src/js/control-bar/progress-control.js +++ b/src/js/control-bar/progress-control.js @@ -75,6 +75,7 @@ vjs.SeekBar.prototype.onMouseDown = function(event){ vjs.Slider.prototype.onMouseDown.call(this, event); this.player_.scrubbing = true; + this.player_.addClass('vjs-scrubbing'); this.videoWasPlaying = !this.player_.paused(); this.player_.pause(); @@ -94,6 +95,7 @@ vjs.SeekBar.prototype.onMouseUp = function(event){ vjs.Slider.prototype.onMouseUp.call(this, event); this.player_.scrubbing = false; + this.player_.removeClass('vjs-scrubbing'); if (this.videoWasPlaying) { this.player_.play(); }