Skip to content

Commit 0b0c7ff

Browse files
committed
Fix #619 - Move Sharp up to be checked before Huawei
1 parent ba0f25c commit 0b0c7ff

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

src/ua-parser.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375

376376
//////////////////////////
377377
// MOBILES & TABLETS
378-
// Ordered by popularity
379378
/////////////////////////
380379

381380
// Samsung
@@ -396,6 +395,10 @@
396395
/(macintosh);/i
397396
], [MODEL, [VENDOR, APPLE]], [
398397

398+
// Sharp
399+
/\b(sh-?[altvz]?\d\d[a-ekm]?)/i
400+
], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
401+
399402
// Huawei
400403
/\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
401404
], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
@@ -511,10 +514,6 @@
511514
/\bmz-([-\w]{2,})/i
512515
], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
513516

514-
// Sharp
515-
/\b(sh-?[altvz]?\d\d[a-ekm]?)/i
516-
], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
517-
518517
// MIXED
519518
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
520519
// BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron

test/device-test.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,6 +1764,15 @@
17641764
"type": "mobile"
17651765
}
17661766
},
1767+
{
1768+
"desc": "Sharp Aquos L2",
1769+
"ua": "Mozilla/5.0 (Linux; Android 7.0; SH-L02) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
1770+
"expect": {
1771+
"vendor": "Sharp",
1772+
"model": "SH-L02",
1773+
"type": "mobile"
1774+
}
1775+
},
17671776
{
17681777
"desc": "Sharp Aquos R2",
17691778
"ua": "Mozilla/5.0 (Linux; Android 8.0; SHV42) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36",

0 commit comments

Comments
 (0)