diff options
| author | Juanjo Diaz <juanjo.diazmo@gmail.com> | 2019-02-27 10:14:50 +0200 |
|---|---|---|
| committer | Juanjo Diaz <juanjo.diazmo@gmail.com> | 2019-02-27 10:14:50 +0200 |
| commit | 41ddb35458f2b64d1aaa2d262c7130e069ea2d99 (patch) | |
| tree | b8e6ac2ad3bd7989ba1be04918a2d06ef688e745 | |
| parent | 44f4c5545f9f46f38e4bd4774df60b6f83b2e0cd (diff) | |
| download | novnc-41ddb35458f2b64d1aaa2d262c7130e069ea2d99.tar.gz | |
Replace unnecessary function supportsCursorURIs by a constant variable
| -rw-r--r-- | core/util/browser.js | 36 | ||||
| -rw-r--r-- | core/util/cursor.js | 2 |
2 files changed, 16 insertions, 22 deletions
diff --git a/core/util/browser.js b/core/util/browser.js index 78e104d..8996cfe 100644 --- a/core/util/browser.js +++ b/core/util/browser.js @@ -25,30 +25,24 @@ window.addEventListener('touchstart', function onFirstTouch() { // brings us a bit closer but is not optimal. export let dragThreshold = 10 * (window.devicePixelRatio || 1); -let _cursor_uris_supported = null; - -export function supportsCursorURIs() { - if (_cursor_uris_supported === null) { - try { - const target = document.createElement('canvas'); - target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default'; - - if (target.style.cursor) { - Log.Info("Data URI scheme cursor supported"); - _cursor_uris_supported = true; - } else { - Log.Warn("Data URI scheme cursor not supported"); - _cursor_uris_supported = false; - } - } catch (exc) { - Log.Error("Data URI scheme cursor test exception: " + exc); - _cursor_uris_supported = false; - } - } +let _supportsCursorURIs = false; - return _cursor_uris_supported; +try { + const target = document.createElement('canvas'); + target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default'; + + if (target.style.cursor) { + Log.Info("Data URI scheme cursor supported"); + _supportsCursorURIs = true; + } else { + Log.Warn("Data URI scheme cursor not supported"); + } +} catch (exc) { + Log.Error("Data URI scheme cursor test exception: " + exc); } +export const supportsCursorURIs = _supportsCursorURIs; + let _supportsImageMetadata = false; try { new ImageData(new Uint8ClampedArray(4), 1, 1); diff --git a/core/util/cursor.js b/core/util/cursor.js index b73f862..0d0b754 100644 --- a/core/util/cursor.js +++ b/core/util/cursor.js @@ -6,7 +6,7 @@ import { supportsCursorURIs, isTouchDevice } from './browser.js'; -const useFallback = !supportsCursorURIs() || isTouchDevice; +const useFallback = !supportsCursorURIs || isTouchDevice; export default class Cursor { constructor() { |