diff --git a/src/js/media/flash.js b/src/js/media/flash.js index 95780d63e2..126bdb6fe3 100644 --- a/src/js/media/flash.js +++ b/src/js/media/flash.js @@ -88,6 +88,17 @@ vjs.Flash = vjs.MediaTechController.extend({ }); } + // firefox doesn't bubble mousemove events to parent. videojs/video-js-swf#37 + // bugzilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=836786 + if (vjs.IS_FIREFOX) { + this.ready(function(){ + vjs.on(this.el(), 'mousemove', vjs.bind(this, function(){ + // since it's a custom event, don't bubble higher than the player + this.player().trigger({ 'type':'mousemove', 'bubbles': false }); + })); + }); + } + // Flash iFrame Mode // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload. // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13) diff --git a/src/js/player.js b/src/js/player.js index be7f560655..636e8797bb 100644 --- a/src/js/player.js +++ b/src/js/player.js @@ -1297,7 +1297,7 @@ vjs.Player.prototype.listenForUserActivity = function(){ // Setting userActivity=true now and setting the interval to the same time // as the activityCheck interval (250) should ensure we never miss the // next activityCheck - mouseInProgress = setInterval(this, onMouseActivity, 250); + mouseInProgress = setInterval(onMouseActivity, 250); }; onMouseUp = function(event) {