From 7f9919f8967c84d663c40b19a53f92da3c784233 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Thu, 10 Nov 2016 09:41:16 +0700 Subject: [PATCH] Fix #185 Huawei Nexus 6P --- src/ua-parser.js | 9 ++++++--- test/device-test.json | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 83e0bdf..86935d0 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -554,6 +554,9 @@ /(nexus\s9)/i // HTC Nexus 9 ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [ + /(nexus\s6p)/i // Huawei Nexus 6P + ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [ + /(microsoft);\s(lumia[\s\w]+)/i // Microsoft Lumia ], [VENDOR, MODEL, [TYPE, MOBILE]], [ @@ -566,7 +569,7 @@ /\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?(:?\s4g)?)[\w\s]+build\//i, /mot[\s-]?(\w+)*/i, /(XT\d{3,4}) build\//i, - /(nexus\s[6])/i + /(nexus\s6)/i ], [MODEL, [VENDOR, 'Motorola'], [TYPE, MOBILE]], [ /android.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i ], [MODEL, [VENDOR, 'Motorola'], [TYPE, TABLET]], [ @@ -620,8 +623,8 @@ /android.+;\s(glass)\s\d/i // Google Glass ], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [ - /android.+(\w+)\s+build\/hm\1/i, // Xiaomi Hongmi 'numeric' models - /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, // Xiaomi Hongmi + /android.+(\w+)\s+build\/hm\1/i, // Xiaomi Hongmi 'numeric' models + /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, // Xiaomi Hongmi /android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d\w)?)\s+build/i // Xiaomi Mi ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [ diff --git a/test/device-test.json b/test/device-test.json index 67e04f9..7967494 100644 --- a/test/device-test.json +++ b/test/device-test.json @@ -49,6 +49,16 @@ "type" : "tablet" } }, + { + "desc" : "Huawei Nexus 6P", + "ua" : "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 6P Build/MTC19V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537", + "expect" : + { + "vendor" : "Huawei", + "model" : "Nexus 6P", + "type" : "mobile" + } + }, { "desc" : "iPod", "ua" : "Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53",