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 'develop' into master

Browse Source
This commit is contained in:
Faisal Salman 2018-10-06 23:30:37 +07:00 committed by GitHub
commit f8820389a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -1,5 +1,6 @@
node_modules/ node_modules/
npm-debug.log npm-debug.log
### vim ### ### vim ###
.*.s[a-w][a-z] .*.s[a-w][a-z]
*.un~ *.un~
@ -8,17 +9,20 @@ Session.vim
*~ *~
.versions .versions
### editors ###
.vscode
.idea
*.sublime-*
### OSX ### ### OSX ###
.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
Icon Icon
# Thumbnails # Thumbnails
._* ._*
# Files that might appear on external disk # Files that might appear on external disk
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes
.idea

1
.npmrc Normal file
View File

@ -0,0 +1 @@
package-lock=false

12
src/ua-parser.js
View File

@ -270,8 +270,13 @@
/(puffin)\/([\w\.]+)/i // Puffin /(puffin)\/([\w\.]+)/i // Puffin
], [[NAME, 'Puffin'], VERSION], [ ], [[NAME, 'Puffin'], VERSION], [
/((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i /(focus)\/([\w\.]+)/i // Firefox Focus
// UCBrowser ], [[NAME, 'Firefox Focus'], VERSION], [
/(opt)\/([\w\.]+)/i // Opera Touch
], [[NAME, 'Opera Touch'], VERSION], [
/((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i // UCBrowser
], [[NAME, 'UCBrowser'], VERSION], [ ], [[NAME, 'UCBrowser'], VERSION], [
/(comodo_dragon)\/([\w\.]+)/i // Comodo Dragon /(comodo_dragon)\/([\w\.]+)/i // Comodo Dragon
@ -280,6 +285,9 @@
/(micromessenger)\/([\w\.]+)/i // WeChat /(micromessenger)\/([\w\.]+)/i // WeChat
], [[NAME, 'WeChat'], VERSION], [ ], [[NAME, 'WeChat'], VERSION], [
/(brave)\/([\w\.]+)/i // Brave browser
], [[NAME, 'Brave'], VERSION], [
/(qqbrowserlite)\/([\w\.]+)/i // QQBrowserLite /(qqbrowserlite)\/([\w\.]+)/i // QQBrowserLite
], [NAME, VERSION], [ ], [NAME, VERSION], [

29
test/browser-test.json
View File

@ -319,6 +319,15 @@
"major" : "1" "major" : "1"
} }
}, },
{
"desc": "Firefox Focus",
"ua": "Mozilla/5.0 (Linux; Android 7.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/6.1.1 Chrome/68.0.3440.91 Mobile Safari/537.36",
"expect": {
"name": "Firefox Focus",
"version": "6.1.1",
"major": "6"
}
},
{ {
"desc" : "Flock", "desc" : "Flock",
"ua" : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008100716 Firefox/3.0.3 Flock/2.0", "ua" : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008100716 Firefox/3.0.3 Flock/2.0",
@ -719,6 +728,16 @@
"major" : "5" "major" : "5"
} }
}, },
{
"desc" : "Opera Touch",
"ua" : "Mozilla/5.0 (Linux; Android 7.0; Lenovo P2a42 Build/NRD90N) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 OPT/1.10.33",
"expect" :
{
"name" : "Opera Touch",
"version" : "1.10.33",
"major" : "1"
}
},
{ {
"desc" : "PhantomJS", "desc" : "PhantomJS",
"ua" : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34", "ua" : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34",
@ -1094,5 +1113,15 @@
"version" : "1.1.0", "version" : "1.1.0",
"major" : "1" "major" : "1"
} }
},
{
"desc" : "Brave Browser",
"ua" : "Brave/4.5.16 CFNetwork/893.13.1 Darwin/17.3.0 (x86_64)",
"expect" :
{
"name" : "Brave",
"version" : "4.5.16",
"major" : "4"
}
} }
] ]