]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merge branch 'qemufix' of https://github.com/CendioOssman/noVNC
authorPierre Ossman <ossman@cendio.se>
Thu, 6 Jul 2017 11:07:19 +0000 (13:07 +0200)
committerPierre Ossman <ossman@cendio.se>
Thu, 6 Jul 2017 11:07:19 +0000 (13:07 +0200)
1  2 
core/input/devices.js
tests/test.keyboard.js

index 954c89dcd70920013ea170cd04d4fb3434b59180,b530fc2ab23ec86a05caa5833b496db2d908cc6e..575d57ace5de0bc5efe941ea778199880f171ff0
@@@ -44,12 -44,12 +44,18 @@@ function isMac() 
  function isWindows() {
      return navigator && !!(/win/i).exec(navigator.platform);
  }
 +function isIOS() {
 +    return navigator &&
 +           (!!(/ipad/i).exec(navigator.platform) ||
 +            !!(/iphone/i).exec(navigator.platform) ||
 +            !!(/ipod/i).exec(navigator.platform));
 +}
+ function isIE() {
+     return navigator && !!(/trident/i).exec(navigator.userAgent);
+ }
+ function isEdge() {
+     return navigator && !!(/edge/i).exec(navigator.userAgent);
+ }
  
  Keyboard.prototype = {
      // private methods
Simple merge