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

Merge pull request #1009 from juanjoDiaz/move_browser_checks

Browse Source 
Move browser checks to browser.js
This commit is contained in:
Solly Ross
2018-02-01 10:33:28 -05:00
committed by GitHub
parent 690d07baba 59ef29163e
commit a4d51bd220
8 changed files with 50 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test.helper.js
+4 -10
View File
@@ -3,13 +3,7 @@ var expect = chai.expect;
import keysyms from '../core/input/keysymdef.js';
import * as KeyboardUtil from "../core/input/util.js";
function isIE() {
return navigator && !!(/trident/i).exec(navigator.userAgent);
}
function isEdge() {
return navigator && !!(/edge/i).exec(navigator.userAgent);
}
import * as browser from '../core/util/browser.js';
describe('Helpers', function() {
"use strict";
@@ -107,7 +101,7 @@ describe('Helpers', function() {
describe('getKey', function() {
it('should prefer key', function() {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
expect(KeyboardUtil.getKey({key: 'a', charCode: 'Š'.charCodeAt(), keyCode: 0x42, which: 0x43})).to.be.equal('a');
});
it('should map legacy values', function() {
@@ -210,7 +204,7 @@ describe('Helpers', function() {
describe('Numpad', function() {
it('should handle Numpad numbers', function() {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
expect(KeyboardUtil.getKeysym({code: 'Digit5', key: '5', location: 0})).to.be.equal(0x0035);
expect(KeyboardUtil.getKeysym({code: 'Numpad5', key: '5', location: 3})).to.be.equal(0xFFB5);
});
@@ -221,7 +215,7 @@ describe('Helpers', function() {
expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: 'Delete', location: 3})).to.be.equal(0xFF9F);
});
it('should handle Numpad Decimal key', function() {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: '.', location: 3})).to.be.equal(0xFFAE);
expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: ',', location: 3})).to.be.equal(0xFFAC);
});
tests/test.keyboard.js
+7 -13
View File
@@ -4,13 +4,7 @@ var expect = chai.expect;
import sinon from '../vendor/sinon.js';
import Keyboard from '../core/input/keyboard.js';
function isIE() {
return navigator && !!(/trident/i).exec(navigator.userAgent);
}
function isEdge() {
return navigator && !!(/edge/i).exec(navigator.userAgent);
}
import * as browser from '../core/util/browser.js';
describe('Key Event Handling', function() {
"use strict";
@@ -29,7 +23,7 @@ describe('Key Event Handling', function() {
describe('Decode Keyboard Events', function() {
it('should decode keydown events', function(done) {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
var kbd = new Keyboard(document);
kbd.onkeyevent = function(keysym, code, down) {
expect(keysym).to.be.equal(0x61);
@@ -40,7 +34,7 @@ describe('Key Event Handling', function() {
kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'}));
});
it('should decode keyup events', function(done) {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
var calls = 0;
var kbd = new Keyboard(document);
kbd.onkeyevent = function(keysym, code, down) {
@@ -135,7 +129,7 @@ describe('Key Event Handling', function() {
describe('suppress the right events at the right time', function() {
beforeEach(function () {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
});
it('should suppress anything with a valid key', function() {
var kbd = new Keyboard(document, {});
@@ -165,7 +159,7 @@ describe('Key Event Handling', function() {
describe('Fake keyup', function() {
it('should fake keyup events for virtual keyboards', function(done) {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
var count = 0;
var kbd = new Keyboard(document);
kbd.onkeyevent = function(keysym, code, down) {
@@ -212,7 +206,7 @@ describe('Key Event Handling', function() {
});
it('should fake keyup events on iOS', function(done) {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
var count = 0;
var kbd = new Keyboard(document);
kbd.onkeyevent = function(keysym, code, down) {
@@ -236,7 +230,7 @@ describe('Key Event Handling', function() {
describe('Track Key State', function() {
beforeEach(function () {
if (isIE() || isEdge()) this.skip();
if (browser.isIE() || browser.isEdge()) this.skip();
});
it('should send release using the same keysym as the press', function(done) {
var kbd = new Keyboard(document);