Back out 4ac407704d74 (bug 689387) for causing or exposing or whatevering bug 718411

This commit is contained in:
Phil Ringnalda 2012-01-16 18:31:02 -08:00
parent e8ce3c3d82
commit 1d3c43824f

View File

@ -819,15 +819,21 @@
},
onMouseInOut : function (event) {
if (this.isTouchControl)
return;
// If the controls are static, don't change anything.
if (!this.dynamicControls)
return;
clearTimeout(this._hideControlsTimeout);
var isMouseOver = (event.type == "mouseenter");
// Ignore events caused by transitions between child nodes.
// Note that the videocontrols element is the same
// size as the *content area* of the video element,
// but this is not the same as the video element's
// border area if the video has border or padding.
if (this.isEventWithin(event, this.videocontrols))
return;
var isMouseOver = (event.type == "mouseover");
// Suppress fading out the controls until the video has rendered
// its first frame. But since autoplay videos start off with no
@ -1274,8 +1280,7 @@
this.muteButton.addEventListener("command", function() { self.toggleMute(); }, false);
this.playButton.addEventListener("command", function() { self.togglePause(); }, false);
this.fullscreenButton.addEventListener("command", function() { self.toggleFullscreen(); }, false );
this.video.addEventListener("mouseenter", function(e) { self.onMouseInOut(e) }, false, true);
this.video.addEventListener("mouseleave", function(e) { self.onMouseInOut(e) }, false, true);
this.controlsSpacer.addEventListener("click", function spacerClickHandler(e) {
if (e.button != 0 || self.hasError())
return;
@ -1313,6 +1318,14 @@
</implementation>
<handlers>
<handler event="mouseover">
if (!this.isTouchControl)
this.Utils.onMouseInOut(event);
</handler>
<handler event="mouseout">
if (!this.isTouchControl)
this.Utils.onMouseInOut(event);
</handler>
<handler event="mousemove">
if (!this.isTouchControl)
this.Utils.onMouseMove(event);