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

Fix conflict with changes

Browse Source
This commit is contained in:
Faisalman 2012-07-28 17:38:21 +07:00
commit 3d60909f30
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
readme.md
View File

@ -14,6 +14,7 @@ Get detailed type and version of web browser, layout engine, operating system, a
## Methods ## Methods
* `getBrowser([uastring])` * `getBrowser([uastring])`
* `getDevice([uastring])`
* `getEngine([uastring])` * `getEngine([uastring])`
* `getOS([uastring])` * `getOS([uastring])`
* `getDevice([uastring])` * `getDevice([uastring])`
@ -39,6 +40,10 @@ Get detailed type and version of web browser, layout engine, operating system, a
version: "", version: "",
major: "" major: ""
}, },
device: {
name: "",
version: ""
},
engine: { engine: {
name: "", name: "",
version: "" version: ""

8
ua-parser.js
View File

@ -99,7 +99,7 @@
/(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany /(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
/(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i, // Chrome/OmniWeb/Arora/Dolphin /(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i, // Chrome/OmniWeb/Arora/Dolphin
], ['name', 'version', 'major'], [ ], ['name', 'version', 'major'], [
/android.+crmo\/((\d+)?[\w\.]+)/i, // Chrome for Android /(?:android.+crmo|crios)\/((\d+)?[\w\.]+)/i, // Chrome for Android/iOS
], [['name', 'Chrome'], 'version', 'major'], [ ], [['name', 'Chrome'], 'version', 'major'], [
/(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i, // Safari/Konqueror /(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i, // Safari/Konqueror
/(applewebkit|khtml)\/((\d+)?[\w\.]+)/i, /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
@ -178,7 +178,8 @@
/\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook /\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook
/(blackberry)[\s-]?(\w+)/i, // BlackBerry /(blackberry)[\s-]?(\w+)/i, // BlackBerry
/(blackberry|benq|nokia|palm(?=\-)|sonyericsson)[\s-]?([\w-]+)*/i, // BenQ/Nokia/Palm/Sony-Ericsson /(blackberry|benq|nokia|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
// BenQ/Nokia/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
/(hp)\s([\w\s]+)/i, // HP iPAQ /(hp)\s([\w\s]+)/i, // HP iPAQ
/(hp).+(touchpad)/i, // HP TouchPad /(hp).+(touchpad)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle /(kindle)\/([\w\.]+)/i, // Kindle
@ -199,6 +200,9 @@
/sec-(sgh\w+)/i /sec-(sgh\w+)/i
], [['name', 'Samsung'], 'version'], [ ], [['name', 'Samsung'], 'version'], [
/(transfo[prime\s]{4,10}\s\w+|(?:android).*eeepc)/i // Asus
], [['name', 'Asus'], 'version'], [
/sie-(\w+)*/i // Siemens /sie-(\w+)*/i // Siemens
], [['name', 'Siemens'], 'version']); ], [['name', 'Siemens'], 'version']);
}; };