@novnc/novnc 1.3.0 → 1.4.0-beta

package/lib/util/browser.js

@@ -1,25 +1,29 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hasScrollbarGutter = exports.dragThreshold = void 0;
+exports.isAndroid = isAndroid;
+exports.isBlink = isBlink;
+exports.isChrome = isChrome;
+exports.isChromeOS = isChromeOS;
+exports.isChromium = isChromium;
+exports.isEdge = isEdge;
 exports.isFirefox = isFirefox;
+exports.isGecko = isGecko;
 exports.isIOS = isIOS;
 exports.isMac = isMac;
+exports.isOpera = isOpera;
 exports.isSafari = isSafari;
 exports.isTouchDevice = void 0;
+exports.isWebKit = isWebKit;
 exports.isWindows = isWindows;
 exports.supportsCursorURIs = void 0;
-
 var Log = _interopRequireWildcard(require("./logging.js"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2019 The noVNC Authors
@@ -29,25 +33,27 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  *
  * Browser feature support detection
  */
+
 // Touch detection
-var isTouchDevice = 'ontouchstart' in document.documentElement || // requried for Chrome debugger
-document.ontouchstart !== undefined || // required for MS Surface
+var isTouchDevice = 'ontouchstart' in document.documentElement ||
+// requried for Chrome debugger
+document.ontouchstart !== undefined ||
+// required for MS Surface
 navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
 exports.isTouchDevice = isTouchDevice;
 window.addEventListener('touchstart', function onFirstTouch() {
   exports.isTouchDevice = isTouchDevice = true;
   window.removeEventListener('touchstart', onFirstTouch, false);
-}, false); // The goal is to find a certain physical width, the devicePixelRatio
-// brings us a bit closer but is not optimal.
+}, false);
 
+// The goal is to find a certain physical width, the devicePixelRatio
+// brings us a bit closer but is not optimal.
 var dragThreshold = 10 * (window.devicePixelRatio || 1);
 exports.dragThreshold = dragThreshold;
 var _supportsCursorURIs = false;
-
 try {
   var target = document.createElement('canvas');
   target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default';
-
   if (target.style.cursor.indexOf("url") === 0) {
     Log.Info("Data URI scheme cursor supported");
     _supportsCursorURIs = true;
@@ -57,32 +63,32 @@ try {
 } catch (exc) {
   Log.Error("Data URI scheme cursor test exception: " + exc);
 }
-
 var supportsCursorURIs = _supportsCursorURIs;
 exports.supportsCursorURIs = supportsCursorURIs;
 var _hasScrollbarGutter = true;
-
 try {
   // Create invisible container
   var container = document.createElement('div');
   container.style.visibility = 'hidden';
   container.style.overflow = 'scroll'; // forcing scrollbars
+  document.body.appendChild(container);
 
-  document.body.appendChild(container); // Create a div and place it in the container
-
+  // Create a div and place it in the container
   var child = document.createElement('div');
-  container.appendChild(child); // Calculate the difference between the container's full width
-  // and the child's width - the difference is the scrollbars
+  container.appendChild(child);
 
-  var scrollbarWidth = container.offsetWidth - child.offsetWidth; // Clean up
+  // Calculate the difference between the container's full width
+  // and the child's width - the difference is the scrollbars
+  var scrollbarWidth = container.offsetWidth - child.offsetWidth;
 
+  // Clean up
   container.parentNode.removeChild(container);
   _hasScrollbarGutter = scrollbarWidth != 0;
 } catch (exc) {
   Log.Error("Scrollbar test exception: " + exc);
 }
-
 var hasScrollbarGutter = _hasScrollbarGutter;
+
 /*
  * The functions for detection of platforms and browsers below are exported
  * but the use of these should be minimized as much as possible.
@@ -90,24 +96,55 @@ var hasScrollbarGutter = _hasScrollbarGutter;
  * It's better to use feature detection than platform detection.
  */
 
+/* OS */
 exports.hasScrollbarGutter = hasScrollbarGutter;
-
 function isMac() {
-  return navigator && !!/mac/i.exec(navigator.platform);
+  return !!/mac/i.exec(navigator.platform);
 }
-
 function isWindows() {
-  return navigator && !!/win/i.exec(navigator.platform);
+  return !!/win/i.exec(navigator.platform);
 }
-
 function isIOS() {
-  return navigator && (!!/ipad/i.exec(navigator.platform) || !!/iphone/i.exec(navigator.platform) || !!/ipod/i.exec(navigator.platform));
+  return !!/ipad/i.exec(navigator.platform) || !!/iphone/i.exec(navigator.platform) || !!/ipod/i.exec(navigator.platform);
+}
+function isAndroid() {
+  /* Android sets navigator.platform to Linux :/ */
+  return !!navigator.userAgent.match('Android ');
 }
+function isChromeOS() {
+  /* ChromeOS sets navigator.platform to Linux :/ */
+  return !!navigator.userAgent.match(' CrOS ');
+}
+
+/* Browser */
 
 function isSafari() {
-  return navigator && navigator.userAgent.indexOf('Safari') !== -1 && navigator.userAgent.indexOf('Chrome') === -1;
+  return !!navigator.userAgent.match('Safari/...') && !navigator.userAgent.match('Chrome/...') && !navigator.userAgent.match('Chromium/...') && !navigator.userAgent.match('Epiphany/...');
 }
-
 function isFirefox() {
-  return navigator && !!/firefox/i.exec(navigator.userAgent);
+  return !!navigator.userAgent.match('Firefox/...') && !navigator.userAgent.match('Seamonkey/...');
+}
+function isChrome() {
+  return !!navigator.userAgent.match('Chrome/...') && !navigator.userAgent.match('Chromium/...') && !navigator.userAgent.match('Edg/...') && !navigator.userAgent.match('OPR/...');
+}
+function isChromium() {
+  return !!navigator.userAgent.match('Chromium/...');
+}
+function isOpera() {
+  return !!navigator.userAgent.match('OPR/...');
+}
+function isEdge() {
+  return !!navigator.userAgent.match('Edg/...');
+}
+
+/* Engine */
+
+function isGecko() {
+  return !!navigator.userAgent.match('Gecko/...');
+}
+function isWebKit() {
+  return !!navigator.userAgent.match('AppleWebKit/...') && !navigator.userAgent.match('Chrome/...');
+}
+function isBlink() {
+  return !!navigator.userAgent.match('Chrome/...');
 }

package/lib/util/cursor.js

@@ -4,32 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _browser = require("./browser.js");
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var useFallback = !_browser.supportsCursorURIs || _browser.isTouchDevice;
-
 var Cursor = /*#__PURE__*/function () {
   function Cursor() {
     _classCallCheck(this, Cursor);
-
     this._target = null;
     this._canvas = document.createElement('canvas');
-
     if (useFallback) {
       this._canvas.style.position = 'fixed';
       this._canvas.style.zIndex = '65535';
-      this._canvas.style.pointerEvents = 'none'; // Can't use "display" because of Firefox bug #1445997
-
+      this._canvas.style.pointerEvents = 'none';
+      // Safari on iOS can select the cursor image
+      // https://bugs.webkit.org/show_bug.cgi?id=249223
+      this._canvas.style.userSelect = 'none';
+      this._canvas.style.WebkitUserSelect = 'none';
+      // Can't use "display" because of Firefox bug #1445997
       this._canvas.style.visibility = 'hidden';
     }
-
     this._position = {
       x: 0,
       y: 0
@@ -45,32 +43,24 @@ var Cursor = /*#__PURE__*/function () {
       'mouseup': this._handleMouseUp.bind(this)
     };
   }
-
   _createClass(Cursor, [{
     key: "attach",
     value: function attach(target) {
       if (this._target) {
         this.detach();
       }
-
       this._target = target;
-
       if (useFallback) {
         document.body.appendChild(this._canvas);
         var options = {
           capture: true,
           passive: true
         };
-
         this._target.addEventListener('mouseover', this._eventHandlers.mouseover, options);
-
         this._target.addEventListener('mouseleave', this._eventHandlers.mouseleave, options);
-
         this._target.addEventListener('mousemove', this._eventHandlers.mousemove, options);
-
         this._target.addEventListener('mouseup', this._eventHandlers.mouseup, options);
       }
-
       this.clear();
     }
   }, {
@@ -79,24 +69,17 @@ var Cursor = /*#__PURE__*/function () {
       if (!this._target) {
         return;
       }
-
       if (useFallback) {
         var options = {
           capture: true,
           passive: true
         };
-
         this._target.removeEventListener('mouseover', this._eventHandlers.mouseover, options);
-
         this._target.removeEventListener('mouseleave', this._eventHandlers.mouseleave, options);
-
         this._target.removeEventListener('mousemove', this._eventHandlers.mousemove, options);
-
         this._target.removeEventListener('mouseup', this._eventHandlers.mouseup, options);
-
         document.body.removeChild(this._canvas);
       }
-
       this._target = null;
     }
   }, {
@@ -106,25 +89,20 @@ var Cursor = /*#__PURE__*/function () {
         this.clear();
         return;
       }
-
       this._position.x = this._position.x + this._hotSpot.x - hotx;
       this._position.y = this._position.y + this._hotSpot.y - hoty;
       this._hotSpot.x = hotx;
       this._hotSpot.y = hoty;
-
       var ctx = this._canvas.getContext('2d');
-
       this._canvas.width = w;
       this._canvas.height = h;
       var img = new ImageData(new Uint8ClampedArray(rgba), w, h);
       ctx.clearRect(0, 0, w, h);
       ctx.putImageData(img, 0, 0);
-
       if (useFallback) {
         this._updatePosition();
       } else {
         var url = this._canvas.toDataURL();
-
         this._target.style.cursor = 'url(' + url + ')' + hotx + ' ' + hoty + ', default';
       }
     }
@@ -138,19 +116,19 @@ var Cursor = /*#__PURE__*/function () {
       this._position.y = this._position.y + this._hotSpot.y;
       this._hotSpot.x = 0;
       this._hotSpot.y = 0;
-    } // Mouse events might be emulated, this allows
-    // moving the cursor in such cases
+    }
 
+    // Mouse events might be emulated, this allows
+    // moving the cursor in such cases
   }, {
     key: "move",
     value: function move(clientX, clientY) {
       if (!useFallback) {
         return;
-      } // clientX/clientY are relative the _visual viewport_,
+      }
+      // clientX/clientY are relative the _visual viewport_,
       // but our position is relative the _layout viewport_,
       // so try to compensate when we can
-
-
       if (window.visualViewport) {
         this._position.x = clientX + window.visualViewport.offsetLeft;
         this._position.y = clientY + window.visualViewport.offsetTop;
@@ -158,11 +136,8 @@ var Cursor = /*#__PURE__*/function () {
         this._position.x = clientX;
         this._position.y = clientY;
       }
-
       this._updatePosition();
-
       var target = document.elementFromPoint(clientX, clientY);
-
       this._updateVisibility(target);
     }
   }, {
@@ -183,23 +158,21 @@ var Cursor = /*#__PURE__*/function () {
     key: "_handleMouseMove",
     value: function _handleMouseMove(event) {
       this._updateVisibility(event.target);
-
       this._position.x = event.clientX - this._hotSpot.x;
       this._position.y = event.clientY - this._hotSpot.y;
-
       this._updatePosition();
     }
   }, {
     key: "_handleMouseUp",
     value: function _handleMouseUp(event) {
       var _this = this;
-
       // We might get this event because of a drag operation that
       // moved outside of the target. Check what's under the cursor
       // now and adjust visibility based on that.
       var target = document.elementFromPoint(event.clientX, event.clientY);
+      this._updateVisibility(target);
 
-      this._updateVisibility(target); // Captures end with a mouseup but we can't know the event order of
+      // Captures end with a mouseup but we can't know the event order of
       // mouseup vs releaseCapture.
       //
       // In the cases when releaseCapture comes first, the code above is
@@ -208,19 +181,15 @@ var Cursor = /*#__PURE__*/function () {
       // In the cases when the mouseup comes first, we need wait for the
       // browser to flush all events and then check again if the cursor
       // should be visible.
-
-
       if (this._captureIsActive()) {
         window.setTimeout(function () {
           // We might have detached at this point
           if (!_this._target) {
             return;
-          } // Refresh the target from elementFromPoint since queued events
+          }
+          // Refresh the target from elementFromPoint since queued events
           // might have altered the DOM
-
-
           target = document.elementFromPoint(event.clientX, event.clientY);
-
           _this._updateVisibility(target);
         }, 0);
       }
@@ -238,34 +207,31 @@ var Cursor = /*#__PURE__*/function () {
       if (this._canvas.style.visibility !== 'hidden') {
         this._canvas.style.visibility = 'hidden';
       }
-    } // Should we currently display the cursor?
+    }
+
+    // Should we currently display the cursor?
     // (i.e. are we over the target, or a child of the target without a
     // different cursor set)
-
   }, {
     key: "_shouldShowCursor",
     value: function _shouldShowCursor(target) {
       if (!target) {
         return false;
-      } // Easy case
-
-
+      }
+      // Easy case
       if (target === this._target) {
         return true;
-      } // Other part of the DOM?
-
-
+      }
+      // Other part of the DOM?
       if (!this._target.contains(target)) {
         return false;
-      } // Has the child its own cursor?
+      }
+      // Has the child its own cursor?
       // FIXME: How can we tell that a sub element has an
       //        explicit "cursor: none;"?
-
-
       if (window.getComputedStyle(target).cursor !== 'none') {
         return false;
       }
-
       return true;
     }
   }, {
@@ -276,7 +242,6 @@ var Cursor = /*#__PURE__*/function () {
       if (this._captureIsActive()) {
         target = document.captureElement;
       }
-
       if (this._shouldShowCursor(target)) {
         this._showCursor();
       } else {
@@ -295,8 +260,6 @@ var Cursor = /*#__PURE__*/function () {
       return document.captureElement && document.documentElement.contains(document.captureElement);
     }
   }]);
-
   return Cursor;
 }();
-
 exports["default"] = Cursor;

package/lib/util/element.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clientToElement = clientToElement;
-
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2020 The noVNC Authors
@@ -16,13 +15,14 @@ exports.clientToElement = clientToElement;
 /*
  * HTML element utility functions
  */
+
 function clientToElement(x, y, elem) {
   var bounds = elem.getBoundingClientRect();
   var pos = {
     x: 0,
     y: 0
-  }; // Clip to target bounds
-
+  };
+  // Clip to target bounds
   if (x < bounds.left) {
     pos.x = 0;
   } else if (x >= bounds.right) {
@@ -30,7 +30,6 @@ function clientToElement(x, y, elem) {
   } else {
     pos.x = x - bounds.left;
   }
-
   if (y < bounds.top) {
     pos.y = 0;
   } else if (y >= bounds.bottom) {
@@ -38,6 +37,5 @@ function clientToElement(x, y, elem) {
   } else {
     pos.y = y - bounds.top;
   }
-
   return pos;
 }

package/lib/util/events.js

@@ -7,7 +7,6 @@ exports.getPointerEvent = getPointerEvent;
 exports.releaseCapture = releaseCapture;
 exports.setCapture = setCapture;
 exports.stopEvent = stopEvent;
-
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2018 The noVNC Authors
@@ -19,55 +18,53 @@ exports.stopEvent = stopEvent;
 /*
  * Cross-browser event and position routines
  */
+
 function getPointerEvent(e) {
   return e.changedTouches ? e.changedTouches[0] : e.touches ? e.touches[0] : e;
 }
-
 function stopEvent(e) {
   e.stopPropagation();
   e.preventDefault();
-} // Emulate Element.setCapture() when not supported
-
+}
 
+// Emulate Element.setCapture() when not supported
 var _captureRecursion = false;
 var _elementForUnflushedEvents = null;
 document.captureElement = null;
-
 function _captureProxy(e) {
   // Recursion protection as we'll see our own event
-  if (_captureRecursion) return; // Clone the event as we cannot dispatch an already dispatched event
+  if (_captureRecursion) return;
 
+  // Clone the event as we cannot dispatch an already dispatched event
   var newEv = new e.constructor(e.type, e);
   _captureRecursion = true;
-
   if (document.captureElement) {
     document.captureElement.dispatchEvent(newEv);
   } else {
     _elementForUnflushedEvents.dispatchEvent(newEv);
   }
+  _captureRecursion = false;
 
-  _captureRecursion = false; // Avoid double events
-
-  e.stopPropagation(); // Respect the wishes of the redirected event handlers
+  // 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") {
     releaseCapture();
   }
-} // Follow cursor style of target element
-
+}
 
+// Follow cursor style of target element
 function _capturedElemChanged() {
   var proxyElem = document.getElementById("noVNC_mouse_capture_elem");
   proxyElem.style.cursor = window.getComputedStyle(document.captureElement).cursor;
 }
-
 var _captureObserver = new MutationObserver(_capturedElemChanged);
-
 function setCapture(target) {
   if (target.setCapture) {
     target.setCapture();
@@ -77,7 +74,6 @@ function setCapture(target) {
     // called multiple times without coordination
     releaseCapture();
     var proxyElem = document.getElementById("noVNC_mouse_capture_elem");
-
     if (proxyElem === null) {
       proxyElem = document.createElement("div");
       proxyElem.id = "noVNC_mouse_capture_elem";
@@ -88,30 +84,29 @@ function setCapture(target) {
       proxyElem.style.height = "100%";
       proxyElem.style.zIndex = 10000;
       proxyElem.style.display = "none";
-      document.body.appendChild(proxyElem); // This is to make sure callers don't get confused by having
-      // our blocking element as the target
+      document.body.appendChild(proxyElem);
 
+      // This is to make sure callers don't get confused by having
+      // our blocking element as the target
       proxyElem.addEventListener('contextmenu', _captureProxy);
       proxyElem.addEventListener('mousemove', _captureProxy);
       proxyElem.addEventListener('mouseup', _captureProxy);
     }
+    document.captureElement = target;
 
-    document.captureElement = target; // Track cursor and get initial cursor
-
+    // Track cursor and get initial cursor
     _captureObserver.observe(target, {
       attributes: true
     });
-
     _capturedElemChanged();
+    proxyElem.style.display = "";
 
-    proxyElem.style.display = ""; // We listen to events on window in order to keep tracking if it
+    // We listen to events on window in order to keep tracking if it
     // happens to leave the viewport
-
     window.addEventListener('mousemove', _captureProxy);
     window.addEventListener('mouseup', _captureProxy);
   }
 }
-
 function releaseCapture() {
   if (document.releaseCapture) {
     document.releaseCapture();
@@ -119,19 +114,17 @@ function releaseCapture() {
   } else {
     if (!document.captureElement) {
       return;
-    } // There might be events already queued. The event proxy needs
+    }
+
+    // There might be events already queued. The event proxy needs
     // access to the captured element for these queued events.
     // E.g. contextmenu (right-click) in Microsoft Edge
     //
     // Before removing the capturedElem pointer we save it to a
     // temporary variable that the unflushed events can use.
-
-
     _elementForUnflushedEvents = document.captureElement;
     document.captureElement = null;
-
     _captureObserver.disconnect();
-
     var proxyElem = document.getElementById("noVNC_mouse_capture_elem");
     proxyElem.style.display = "none";
     window.removeEventListener('mousemove', _captureProxy);