proxmox-mirrors/mirror_novnc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_novnc synced 2025-08-15 19:02:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve setCapture polyfill

Browse Source 
Fix some corner cases.

Fixes issue #773
This commit is contained in:
Samuel Mannehed 2017-02-14 16:20:18 +01:00
parent 0ee5ca6ebe
commit 1658466579
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/util.js
View File

@ -531,6 +531,14 @@ Util._captureProxy = function (e) {
Util._captureElem.dispatchEvent(newEv); Util._captureElem.dispatchEvent(newEv);
Util._captureRecursion = false; Util._captureRecursion = false;
// Avoid double events
e.stopPropagation();
// Respect the wishes of the redirected event handlers
if (newEv.defaultPrevented) {
e.preventDefault();
}
// Implicitly release the capture on button release // Implicitly release the capture on button release
if ((e.type === "mouseup") || (e.type === "touchend")) { if ((e.type === "mouseup") || (e.type === "touchend")) {
Util.releaseCapture(); Util.releaseCapture();
@ -547,6 +555,10 @@ Util.setCapture = function (elem) {
elem.addEventListener('touchend', Util.releaseCapture); elem.addEventListener('touchend', Util.releaseCapture);
} else { } else {
// Release any existing capture in case this method is
// called multiple times without coordination
Util.releaseCapture();
// Safari on iOS 9 has a broken constructor for TouchEvent. // Safari on iOS 9 has a broken constructor for TouchEvent.
// We are fine in this case however, since Safari seems to // We are fine in this case however, since Safari seems to
// have some sort of implicit setCapture magic anyway. // have some sort of implicit setCapture magic anyway.
@ -572,6 +584,10 @@ Util.setCapture = function (elem) {
captureElem.style.display = "none"; captureElem.style.display = "none";
document.body.appendChild(captureElem); document.body.appendChild(captureElem);
// This is to make sure callers don't get confused by having
// our blocking element as the target
captureElem.addEventListener('contextmenu', Util._captureProxy);
captureElem.addEventListener('mousemove', Util._captureProxy); captureElem.addEventListener('mousemove', Util._captureProxy);
captureElem.addEventListener('mouseup', Util._captureProxy); captureElem.addEventListener('mouseup', Util._captureProxy);
@ -598,8 +614,17 @@ Util.releaseCapture = function () {
document.releaseCapture(); document.releaseCapture();
} else { } else {
if (!Util._captureElem) {
return;
}
// There might be events already queued, so we need to wait for
// them to flush. E.g. contextmenu in Microsoft Edge
//
// FIXME: What happens if setCapture is called before this fires?
window.setTimeout(function() { Util._captureElem = null; });
var captureElem = document.getElementById("noVNC_mouse_capture_elem"); var captureElem = document.getElementById("noVNC_mouse_capture_elem");
Util._captureElem = null;
captureElem.style.display = "none"; captureElem.style.display = "none";
window.removeEventListener('mousemove', Util._captureProxy); window.removeEventListener('mousemove', Util._captureProxy);