forked from mirrors/gecko-dev
Bug 510977: Mouseover Popups are not blocked by the pop-up blocker, r=froystig
This commit is contained in:
parent
ffebf2758b
commit
1879089810
1 changed files with 6 additions and 2 deletions
|
|
@ -476,6 +476,7 @@ MouseModule.prototype = {
|
||||||
|
|
||||||
let targetClicker = this.getClickerFromElement(evInfo.event.target);
|
let targetClicker = this.getClickerFromElement(evInfo.event.target);
|
||||||
|
|
||||||
|
this._movedOutOfRadius = false;
|
||||||
this._targetScrollInterface = targetScrollInterface;
|
this._targetScrollInterface = targetScrollInterface;
|
||||||
this._dragger = (targetScrollInterface) ? (targetScrollbox.customDragger || this._defaultDragger)
|
this._dragger = (targetScrollInterface) ? (targetScrollbox.customDragger || this._defaultDragger)
|
||||||
: null;
|
: null;
|
||||||
|
|
@ -518,14 +519,14 @@ MouseModule.prototype = {
|
||||||
|
|
||||||
let [sX, sY] = dragData.lockAxis(evInfo.event.screenX, evInfo.event.screenY);
|
let [sX, sY] = dragData.lockAxis(evInfo.event.screenX, evInfo.event.screenY);
|
||||||
|
|
||||||
let movedOutOfRadius = dragData.isPointOutsideRadius(sX, sY);
|
this._movedOutOfRadius = this._movedOutOfRadius || dragData.isPointOutsideRadius(sX, sY);
|
||||||
|
|
||||||
if (dragData.dragging) // XXX same check as this._dragger but we
|
if (dragData.dragging) // XXX same check as this._dragger but we
|
||||||
this._doDragStop(sX, sY); // are using both, no good reason
|
this._doDragStop(sX, sY); // are using both, no good reason
|
||||||
|
|
||||||
this._recordEvent(evInfo);
|
this._recordEvent(evInfo);
|
||||||
|
|
||||||
this._doClick(movedOutOfRadius);
|
this._doClick(this._movedOutOfRadius);
|
||||||
|
|
||||||
this._owner.ungrab(this);
|
this._owner.ungrab(this);
|
||||||
},
|
},
|
||||||
|
|
@ -542,6 +543,9 @@ MouseModule.prototype = {
|
||||||
evInfo.event.preventDefault();
|
evInfo.event.preventDefault();
|
||||||
this._doDragMove(sX, sY);
|
this._doDragMove(sX, sY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this._movedOutOfRadius = this._movedOutOfRadius ||
|
||||||
|
dragData.isPointOutsideRadius(evInfo.event.screenX, evInfo.event.screenY);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue