Compare commits

..

2 Commits

Author SHA1 Message Date
Faisalman
5e4d686e3e Tag v0.2.1 2012-07-19 22:45:55 +07:00
Faisalman
f1065dc4f8 Added some devices: Asus, Acer, Dell, Nexus, ZTE 2012-07-19 05:52:11 +07:00
3 changed files with 15 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
{ {
"title" : "UA-Parser.js", "title" : "UA-Parser.js",
"name" : "ua-parser-js", "name" : "ua-parser-js",
"version" : "0.1.2", "version" : "0.2.1",
"author" : { "author" : {
"name" : "Faisal Salman", "name" : "Faisal Salman",
"email" : "fyzlman@gmail.com", "email" : "fyzlman@gmail.com",

View File

@@ -2,10 +2,10 @@
JavaScript-based user-agent parser JavaScript-based user-agent parser
* Author : Faisalman <<fyzlman@gmail.com>> * Author : Faisalman <<fyzlman@gmail.com>>
* Home : http://faisalman.github.com/ua-parser-js * Home : http://faisalman.github.com/ua-parser-js
* Source : https://github.com/faisalman/ua-parser-js * Source : https://github.com/faisalman/ua-parser-js
* License : GPLv2 * License : GPLv2
## Features ## Features
@@ -14,6 +14,7 @@ Get detailed type and version of web browser, layout engine, and operating syste
## Methods ## Methods
* `getBrowser([uastring])` * `getBrowser([uastring])`
* `getDevice([uastring])`
* `getEngine([uastring])` * `getEngine([uastring])`
* `getOS([uastring])` * `getOS([uastring])`
* `setUA(uastring)` * `setUA(uastring)`
@@ -35,6 +36,10 @@ Get detailed type and version of web browser, layout engine, and operating syste
version: "", version: "",
major: "" major: ""
}, },
device: {
name: "",
version: ""
},
engine: { engine: {
name: "", name: "",
version: "" version: ""

View File

@@ -1,4 +1,4 @@
// UA-Parser.js v0.2.0 // UA-Parser.js v0.2.1
// Lightweight JavaScript-based user-agent parser // Lightweight JavaScript-based user-agent parser
// https://github.com/faisalman/ua-parser-js // https://github.com/faisalman/ua-parser-js
// //
@@ -177,7 +177,8 @@ function UAParser (uastring) {
/\((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
@@ -198,6 +199,9 @@ function UAParser (uastring) {
/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']);
}; };