github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-09-27 16:08:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shchotse-add_true_meizu_device_type' into develop

Browse Source
This commit is contained in:
Faisal Salman 2018-09-08 14:19:00 +07:00
commit d601ab195f
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -86,6 +86,7 @@
"sgautrea <shanegautreau@gmail.com>", "sgautrea <shanegautreau@gmail.com>",
"Shane Gautreau <sgautrea@opentext.com>", "Shane Gautreau <sgautrea@opentext.com>",
"Shane Thacker <shane@steadymade.com>", "Shane Thacker <shane@steadymade.com>",
"shchotse <topal@mail.ua>",
"Simon Eisenmann <simon@longsleep.org>", "Simon Eisenmann <simon@longsleep.org>",
"Simon Lang <me@simonlang.org>", "Simon Lang <me@simonlang.org>",
"Stiekel <histkc@gmail.com>", "Stiekel <histkc@gmail.com>",

2
src/ua-parser.js
View File

@ -681,6 +681,8 @@
],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [ ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
/android.+;\s(m[1-5]\snote)\sbuild/i // Meizu Tablet /android.+;\s(m[1-5]\snote)\sbuild/i // Meizu Tablet
], [MODEL, [VENDOR, 'Meizu'], [TYPE, TABLET]], [ ], [MODEL, [VENDOR, 'Meizu'], [TYPE, TABLET]], [
/(mz)-([\w-]{2,})/i // Meizu Phone
], [[VENDOR, 'Meizu'], MODEL, [TYPE, MOBILE]], [
/android.+a000(1)\s+build/i, // OnePlus /android.+a000(1)\s+build/i, // OnePlus
/android.+oneplus\s(a\d{4})\s+build/i /android.+oneplus\s(a\d{4})\s+build/i

20
test/device-test.json
View File

@ -133,6 +133,26 @@
"type": "mobile" "type": "mobile"
} }
}, },
{
"desc" : "Meizu M3S",
"ua" : "Mozilla/5.0 (X11; Linux; Android 5.1; MZ-M3s Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrom/45.0.2454.94 Mobile Safari/537.36",
"expect" :
{
"vendor" : "MZ",
"model" : "M3s",
"type" : "mobile"
}
},
{
"desc" : "Microsoft Lumia 950",
"ua" : "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
"expect" :
{
"vendor" : "Microsoft",
"model" : "Lumia 950",
"type" : "mobile"
}
},
{ {
"desc": "Motorola Nexus 6", "desc": "Motorola Nexus 6",
"ua": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36", "ua": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36",