jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace unnecessary function supportsCursorURIs by a constant variable

This commit is contained in:
Juanjo Diaz 2019-02-27 10:14:50 +02:00
parent 44f4c5545f
commit 41ddb35458
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/util/browser.js
View File

@ -25,30 +25,24 @@ window.addEventListener('touchstart', function onFirstTouch() {
// brings us a bit closer but is not optimal. // brings us a bit closer but is not optimal.
export let dragThreshold = 10 * (window.devicePixelRatio || 1); export let dragThreshold = 10 * (window.devicePixelRatio || 1);
let _cursor_uris_supported = null; let _supportsCursorURIs = false;
export function supportsCursorURIs() { try {
if (_cursor_uris_supported === null) { const target = document.createElement('canvas');
try { target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default';
const target = document.createElement('canvas');
target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default';
if (target.style.cursor) { if (target.style.cursor) {
Log.Info("Data URI scheme cursor supported"); Log.Info("Data URI scheme cursor supported");
_cursor_uris_supported = true; _supportsCursorURIs = true;
} else { } else {
Log.Warn("Data URI scheme cursor not supported"); 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;
}
} }
} catch (exc) {
return _cursor_uris_supported; Log.Error("Data URI scheme cursor test exception: " + exc);
} }
export const supportsCursorURIs = _supportsCursorURIs;
let _supportsImageMetadata = false; let _supportsImageMetadata = false;
try { try {
new ImageData(new Uint8ClampedArray(4), 1, 1); new ImageData(new Uint8ClampedArray(4), 1, 1);

2
core/util/cursor.js
View File

@ -6,7 +6,7 @@
import { supportsCursorURIs, isTouchDevice } from './browser.js'; import { supportsCursorURIs, isTouchDevice } from './browser.js';
const useFallback = !supportsCursorURIs() || isTouchDevice; const useFallback = !supportsCursorURIs || isTouchDevice;
export default class Cursor { export default class Cursor {
constructor() { constructor() {