From b13c891d7f7b0957575a0ea22b48958617ba3207 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Fri, 11 Nov 2016 09:26:59 +0700 Subject: [PATCH] Fix #190 haiku --- src/ua-parser.js | 4 +++- test/os-test.json | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 86935d0..d0c988e 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -765,6 +765,9 @@ /\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]+)*/i // FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly ], [NAME, VERSION],[ + /(haiku)\s(\w+)/i // Haiku + ], [NAME, VERSION],[ + /(ip[honead]+)(?:.*os\s([\w]+)*\slike\smac|;\sopera)/i // iOS ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [ @@ -774,7 +777,6 @@ // Other /((?:open)?solaris)[\/\s-]?([\w\.]+)*/i, // Solaris - /(haiku)\s(\w+)/i, // Haiku /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i, // AIX /(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms)/i, // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS/OpenVMS diff --git a/test/os-test.json b/test/os-test.json index 547b9eb..c0100d0 100644 --- a/test/os-test.json +++ b/test/os-test.json @@ -514,11 +514,11 @@ }, { "desc" : "Haiku", - "ua" : "", + "ua" : "Mozilla/5.0 (Macintosh; Intel Haiku R1 x86) AppleWebKit/602.1.1 (KHTML, like Gecko) WebPositive/1.2 Version/8.0 Safari/602.1.1", "expect" : { - "name" : "", - "version" : "" + "name" : "Haiku", + "version" : "R1" } }, {