diff --git a/package.json b/package.json index d03cae5..dd288de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "UA-Parser.JS", "name": "ua-parser-js", - "version": "0.4.2", + "version": "0.4.3", "author": "Faisal Salman (http://faisalman.com)", "description": "Lightweight JavaScript-based user-agent string parser", "keywords": [ diff --git a/readme.md b/readme.md index 58c9fea..0aacf17 100644 --- a/readme.md +++ b/readme.md @@ -48,8 +48,9 @@ Extract detailed type of web browser, layout engine, operating system, and devic version: "" }, device: { - name: "", - version: "" + model: "", + type: "", + vendor: "" } } */ @@ -59,12 +60,14 @@ Extract detailed type of web browser, layout engine, operating system, and devic parser.setUA(uastr); console.log(parser.getResult().browser); // {name: "Chromium", major: "15", version: "15.0.874.106"} + console.log(parser.getResult().device); // {model: undefined, type: undefined, vendor: undefined} console.log(parser.getResult().engine); // {name: "AppleWebKit", version: "535.2"} console.log(parser.getResult().os); // {name: "Ubuntu", version: "11.10"} // let's take another test please console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getBrowser().name); // "Konqueror" console.log(parser.getOS()); // {name: "OpenBSD", version: undefined} + console.log(parser.getEngine()); // {name: "KHTML", version: "4.1.4"} ``` @@ -75,7 +78,7 @@ var UAParser = require('ua-parser'); var parser = new UAParser(); var uaString = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11'; -console.log(parser.setUA(uaString).getDevice().name); // "PlayBook" +console.log(parser.setUA(uaString).getDevice().model); // "PlayBook" console.log(parser.getOS()) // {name: "RIM Tablet OS", version: "1.0.0"} console.log(parser.getEngine().name); // "AppleWebKit" ``` diff --git a/ua-parser.js b/ua-parser.js index ab0e448..4e24ad2 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -1,4 +1,4 @@ -// UA-Parser.JS v0.4.2 +// UA-Parser.JS v0.4.3 // Lightweight JavaScript-based User-Agent string parser // https://github.com/faisalman/ua-parser-js // @@ -154,7 +154,7 @@ /(blackberry)[\s-]?(\w+)/i, // BlackBerry /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|huawei|meizu)[\s_-]?([\w-]+)*/i, // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/Huawei/Meizu - /(hp)\s([\w\s]+\w)/i // HP iPAQ + /(hp)\s([\w\s]+\w)/i, // HP iPAQ /(asus)-?(\w+)/i // Asus ], ['vendor', 'model', ['type', 'Mobile']], [